mesa: Changes to 'ubuntu'
debian/changelog | 7 +++
debian/patches/103_rs600_support.patch | 65 +++++++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 73 insertions(+)
New commits:
commit a101fb7f514143f40e52db52e5947d6ddafadf3b
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Mar 12 19:11:59 2009 -0700
Add RS600 support
diff --git a/debian/changelog b/debian/changelog
index 839c4f7..7971869 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.3-1ubuntu3) jaunty; urgency=low
+
+ * Add 103_rs600_support.patch: Adds support for the RS600 chip and sets
+ the number of gb pipes properly for r3xx/r5xx cards.
+
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 03 Mar 2009 00:26:59 -0800
+
mesa (7.3-1ubuntu2) jaunty; urgency=low
[ Julien Cristau ]
diff --git a/debian/patches/103_rs600_support.patch b/debian/patches/103_rs600_support.patch
new file mode 100644
index 0000000..a208066
--- /dev/null
+++ b/debian/patches/103_rs600_support.patch
@@ -0,0 +1,65 @@
+From 69f080cefced8b3395cdf179c107303a1013d196 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher@gmail.com>
+Date: Wed, 25 Feb 2009 22:30:56 +0000
+Subject: R300: Add support for RS600 chips
+
+---
+diff --git a/src/mesa/drivers/dri/radeon/radeon_chipset.h b/src/mesa/drivers/dri/radeon/radeon_chipset.h
+index 55a73ea..f6bd1eb 100644
+--- a/src/mesa/drivers/dri/radeon/radeon_chipset.h
++++ b/src/mesa/drivers/dri/radeon/radeon_chipset.h
+@@ -247,6 +247,9 @@
+ #define PCI_CHIP_RS350_7835 0x7835
+ #define PCI_CHIP_RS690_791E 0x791E
+ #define PCI_CHIP_RS690_791F 0x791F
++#define PCI_CHIP_RS600_793F 0x793F
++#define PCI_CHIP_RS600_7941 0x7941
++#define PCI_CHIP_RS600_7942 0x7942
+ #define PCI_CHIP_RS740_796C 0x796C
+ #define PCI_CHIP_RS740_796D 0x796D
+ #define PCI_CHIP_RS740_796E 0x796E
+@@ -270,6 +273,7 @@ enum {
+ CHIP_FAMILY_R420,
+ CHIP_FAMILY_RV410,
+ CHIP_FAMILY_RS400,
++ CHIP_FAMILY_RS600,
+ CHIP_FAMILY_RS690,
+ CHIP_FAMILY_RS740,
+ CHIP_FAMILY_RV515,
+diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
+index 56c22fa..f7cba50 100644
+--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
++++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
+@@ -685,6 +685,12 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+ screen->chip_family = CHIP_FAMILY_RS400;
+ break;
+
++ case PCI_CHIP_RS600_793F:
++ case PCI_CHIP_RS600_7941:
++ case PCI_CHIP_RS600_7942:
++ screen->chip_family = CHIP_FAMILY_RS600;
++ break;
++
+ case PCI_CHIP_RS690_791E:
+ case PCI_CHIP_RS690_791F:
+ screen->chip_family = CHIP_FAMILY_RS690;
+@@ -843,7 +849,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+ ret = radeonGetParam( sPriv->fd, RADEON_PARAM_FB_LOCATION,
+ &temp);
+ if (ret) {
+- if (screen->chip_family < CHIP_FAMILY_RS690)
++ if (screen->chip_family < CHIP_FAMILY_RS600)
+ screen->fbLocation = ( INREG( RADEON_MC_FB_LOCATION ) & 0xffff) << 16;
+ else {
+ FREE( screen );
+@@ -854,7 +860,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+ screen->fbLocation = (temp & 0xffff) << 16;
+ }
+
+- if (screen->chip_family >= CHIP_FAMILY_RV515) {
++ if (screen->chip_family >= CHIP_FAMILY_R300) {
+ ret = radeonGetParam( sPriv->fd, RADEON_PARAM_NUM_GB_PIPES,
+ &temp);
+ if (ret) {
+--
+cgit v0.8.2
diff --git a/debian/patches/series b/debian/patches/series
index 7543d4c..40f7d3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
04_osmesa_version.diff
101_ubuntu_hidden_glname.patch
102_dont_vblank.diff
+103_rs600_support.patch
Reply to: