xserver-xorg-video-ati: Changes to 'ubuntu'
debian/patches/fix-xorg-configure.patch | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
New commits:
commit 288b67145ee18a8bf50b19fca5b4985e068d030b
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Tue Mar 11 10:22:14 2014 -0400
Actually add fix-xorg-configure.patch
diff --git a/debian/patches/fix-xorg-configure.patch b/debian/patches/fix-xorg-configure.patch
new file mode 100644
index 0000000..a2b7135
--- /dev/null
+++ b/debian/patches/fix-xorg-configure.patch
@@ -0,0 +1,28 @@
+commit 7cd972a85705341dd8306eefc558ed9e5def05d7
+Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+Date: Thu Feb 20 11:14:03 2014 +0100
+
+ return immediately in preinit when called with PROBE_DETECT
+
+ This fixes a crash with Xorg -configure.
+
+ Bug:
+ https://bugs.launchpad.net/ubuntu/+source/xorg/+bug/1278046
+
+ Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+diff --git a/src/radeon_kms.c b/src/radeon_kms.c
+index 21a420f..4a6c38e 100644
+--- a/src/radeon_kms.c
++++ b/src/radeon_kms.c
+@@ -781,6 +781,9 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
+ uint32_t tiling = 0;
+ int cpp;
+
++ if (flags & PROBE_DETECT)
++ return TRUE;
++
+ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
+ "RADEONPreInit_KMS\n");
+ if (pScrn->numEntities != 1) return FALSE;
Reply to: