← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/mesa/jaunty

« back to all changes in this revision

Viewing changes to debian/patches/103_rs600_support.patch

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-04-03 12:42:06 UTC
  • mfrom: (1.2.16 upstream) (3.1.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20090403124206-0oo9dl0tcmd0qr38
Tags: 7.4-0ubuntu1
https://launchpad.net/bugs/330476
https://launchpad.net/bugs/347171
https://launchpad.net/bugs/349127
https://launchpad.net/bugs/146298
https://launchpad.net/bugs/324854
* New upstream release, merge from debian-experimental
  (LP: #330476, #347171, #349127)
* Drop 103_rs600_support.patch, included in this version.
* Drop 104_swrast_fbconfigs.patch, included in this version.
* Add 103_bump_965_texture_limit.diff. (LP: #146298)
* Add 104_fix_dri2_ext_tfp.diff. (LP: #324854)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/103_rs600_support.patch
1
 
From 69f080cefced8b3395cdf179c107303a1013d196 Mon Sep 17 00:00:00 2001
2
 
From: Alex Deucher <alexdeucher@gmail.com>
3
 
Date: Wed, 25 Feb 2009 22:30:56 +0000
4
 
Subject: R300: Add support for RS600 chips
5
 
 
6
 
---
7
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_chipset.h b/src/mesa/drivers/dri/radeon/radeon_chipset.h
8
 
index 55a73ea..f6bd1eb 100644
9
 
--- a/src/mesa/drivers/dri/radeon/radeon_chipset.h
10
 
+++ b/src/mesa/drivers/dri/radeon/radeon_chipset.h
11
 
@@ -247,6 +247,9 @@
12
 
 #define PCI_CHIP_RS350_7835            0x7835
13
 
 #define PCI_CHIP_RS690_791E             0x791E
14
 
 #define PCI_CHIP_RS690_791F             0x791F
15
 
+#define PCI_CHIP_RS600_793F             0x793F
16
 
+#define PCI_CHIP_RS600_7941             0x7941
17
 
+#define PCI_CHIP_RS600_7942             0x7942
18
 
 #define PCI_CHIP_RS740_796C             0x796C
19
 
 #define PCI_CHIP_RS740_796D             0x796D
20
 
 #define PCI_CHIP_RS740_796E             0x796E
21
 
@@ -270,6 +273,7 @@ enum {
22
 
    CHIP_FAMILY_R420,
23
 
    CHIP_FAMILY_RV410,
24
 
    CHIP_FAMILY_RS400,
25
 
+   CHIP_FAMILY_RS600,
26
 
    CHIP_FAMILY_RS690,
27
 
    CHIP_FAMILY_RS740,
28
 
    CHIP_FAMILY_RV515,
29
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
30
 
index 56c22fa..f7cba50 100644
31
 
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
32
 
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
33
 
@@ -685,6 +685,12 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
34
 
       screen->chip_family = CHIP_FAMILY_RS400;
35
 
       break;
36
 
 
37
 
+   case PCI_CHIP_RS600_793F:
38
 
+   case PCI_CHIP_RS600_7941:
39
 
+   case PCI_CHIP_RS600_7942:
40
 
+      screen->chip_family = CHIP_FAMILY_RS600;
41
 
+      break;
42
 
+
43
 
    case PCI_CHIP_RS690_791E:
44
 
    case PCI_CHIP_RS690_791F:
45
 
       screen->chip_family = CHIP_FAMILY_RS690;
46
 
@@ -843,7 +849,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
47
 
    ret = radeonGetParam( sPriv->fd, RADEON_PARAM_FB_LOCATION,
48
 
                          &temp);
49
 
    if (ret) {
50
 
-       if (screen->chip_family < CHIP_FAMILY_RS690)
51
 
+       if (screen->chip_family < CHIP_FAMILY_RS600)
52
 
           screen->fbLocation      = ( INREG( RADEON_MC_FB_LOCATION ) & 0xffff) << 16;
53
 
        else {
54
 
            FREE( screen );
55
 
@@ -854,7 +860,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
56
 
        screen->fbLocation = (temp & 0xffff) << 16;
57
 
    }
58
 
 
59
 
-   if (screen->chip_family >= CHIP_FAMILY_RV515) {
60
 
+   if (screen->chip_family >= CHIP_FAMILY_R300) {
61
 
        ret = radeonGetParam( sPriv->fd, RADEON_PARAM_NUM_GB_PIPES,
62
 
                             &temp);
63
 
        if (ret) {
64
 
--
65
 
cgit v0.8.2