Merge lp:~andrikos/ubuntu/quantal/xserver-xorg-video-intel/fix-ati-hybrid into lp:ubuntu/quantal/xserver-xorg-video-intel

[Nick Andrik]

The patch proposed is practically the only way to get hybrid fglrx/intel systems working using intel driver of 2.20.2 and above. It affects all ubuntu versions from Quantal and on.

What it does is reverting a commit from upstream intel driver that causes the incompatibility (X server crashing with segmentation fault) with the fglrx driver.

Upstream developer has already commented that this is a safe commit to revert:
https://bugs.freedesktop.org/show_bug.cgi?id=56494#c6

[lp:~andrikos/ubuntu/quantal/xserver-xorg-video-intel/fix-ati-hybrid]

176. By Nick Andrik on 2012-12-19

Added (LP: #1068404) in the list of the bugs fixed by this patch

[Dimitri John Ledkov (xnox)]

has this been already fixed in raring?
For SRU the version number is not appropriate.
There is no need to mention bugs that are now duplicates (bug #1068661)
The bug description should be updated as per SRU template.
https://wiki.ubuntu.com/StableReleaseUpdates#SRU_Bug_Template

review: Needs Information

[Nick Andrik (andrikos)]

No, it's not fixed in raring.
The initial branch was against the quantal version, if needed I can update it against raring.

The bugs were mentioned before one of them was marked as duplicate (it was not clear at that time), I can remove it from the changelog.

The detail description as how the bug is fixed is included in the patch description. Having this along the bug number should be ok, no?

In nay case, please let me know of the things needed and I will update the branch.

This patch should also be included in quantal, since the hybrid fglrx/intel systems there are broken without this fix.

Thanks

[lp:~andrikos/ubuntu/quantal/xserver-xorg-video-intel/fix-ati-hybrid]

177. By Nick Andrik on 2013-01-04

- Updated package version to mark NMU for SRU
- Removed reference to (LP: #1068661) since it is now a confirmed duplicate

[Nick Andrik (andrikos)]

LP: #1068404

[Impact]

 * Hybrid systems with ATI/intel GPUs using fglrx get a segmentation fault in X when using 12.10. In 12.04 these systems were working fine.

 * This bug represents a severe regression from precise to quantal, since is crashing on startup

 * It reverts the following upstream commit which has "hidden" some global symbols of the intel driver:
http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=05dcc5f1699ba90fc14c50882e8d4be89bc4a4f9

[Test Case]

 * Get an hybrid ATI/intel system.
   Install quantal: The system should boot fine
   Install the proprietary fglrx package and reboot: The X server crashes on startup

[Regression Potential]

 * Upstream has stated that reverting this patch should be safe enough for SRU (mainly Comment 7):
https://bugs.freedesktop.org/show_bug.cgi?id=56494#c6

 * This patch has enabled many users to have their hybrid systems working. No reported regressions so far

[Other Info]

 * To the best of my knowledge this patch is currently the only known way to get fglrx/intel hybrid systems to work in quantal. It has been tested by many users in the bug report and this change fixed their systems

[Dimitri John Ledkov (xnox)]

I have asked tjaalton to look into this bug report/merge proposal again.
Please, wait on him to review it.

review: Needs Information

[Nick Andrik (andrikos)]

Added him, thanks!

[Nick Andrik (andrikos)]

There has been a regression found if radeon/intel system is used (without fglrx), where the X crashes when using this patch.
Since this is an X crash on the default configuration, this branch is not suitable for SRU yet

Unmerged revisions

177. By Nick Andrik on 2013-01-04

- Updated package version to mark NMU for SRU
- Removed reference to (LP: #1068661) since it is now a confirmed duplicate

176. By Nick Andrik on 2012-12-19

Added (LP: #1068404) in the list of the bugs fixed by this patch

175. By Nick Andrik on 2012-11-05

Removing reference to (LP: #1068661) since it is not a confirmed duplicate

174. By Nick Andrik on 2012-11-05

Add fix-ati-hybrid.patch to fix ATI/Intel hybrid setups
(LP: #1068404, #1068661)

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-01 15:39:54 +0000
+++ debian/changelog	2013-01-04 01:46:21 +0000
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.20.9-0ubuntu2.1) quantal; urgency=low
+
+  * Add fix-ati-hybrid.patch to fix ATI/Intel hybrid setups (LP: #1068404)
+
+ -- Nick Andrik <[e-mail]>  Fri, 04 Jan 2013 03:35:08 +0200
+
 xserver-xorg-video-intel (2:2.20.9-0ubuntu2) quantal; urgency=low
 
   [ Maarten Lankhorst ]

=== added file 'debian/patches/fix-ati-hybrid.patch'
--- debian/patches/fix-ati-hybrid.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-ati-hybrid.patch	2013-01-04 01:46:21 +0000
@@ -0,0 +1,155 @@
+Fixes regression for ati/intel hybrid systems
+by reverting some commits of xf86-video-intel:
+
+	commit 05dcc5f1699ba90fc14c50882e8d4be89bc4a4f9
+	Author: Chris Wilson <[e-mail]>
+	Date:   Fri Aug 3 15:08:45 2012 +0100
+
+	    Pass the chipset info through driverPrivate rather than a global pointer
+
+
+Nick Andrik <[e-mail]>
+Index: xserver-xorg-video-intel-2.20.9/src/intel_driver.c
+===================================================================
+--- xserver-xorg-video-intel-2.20.9.orig/src/intel_driver.c	2012-10-30 02:54:05.456713161 +0100
++++ xserver-xorg-video-intel-2.20.9/src/intel_driver.c	2012-10-30 02:54:16.186075606 +0100
+@@ -185,7 +185,7 @@
+ static void intel_check_chipset_option(ScrnInfoPtr scrn)
+ {
+ 	intel_screen_private *intel = intel_get_screen_private(scrn);
+-	intel_detect_chipset(scrn, intel->pEnt, intel->PciInfo);
++	intel->info = intel_detect_chipset(scrn, intel->pEnt, intel->PciInfo);
+ }
+ 
+ static Bool I830GetEarlyOptions(ScrnInfoPtr scrn)
+@@ -491,15 +491,14 @@
+ 	if (flags & PROBE_DETECT)
+ 		return TRUE;
+ 
+-	if (((uintptr_t)scrn->driverPrivate) & 1) {
+-		intel = xnfcalloc(sizeof(*intel), 1);
++	intel = intel_get_screen_private(scrn);
++	if (intel == NULL) {
++		intel = xnfcalloc(sizeof(intel_screen_private), 1);
+ 		if (intel == NULL)
+ 			return FALSE;
+ 
+-		intel->info = (void *)((uintptr_t)scrn->driverPrivate & ~1);
+ 		scrn->driverPrivate = intel;
+ 	}
+-	intel = intel_get_screen_private(scrn);
+ 	intel->scrn = scrn;
+ 	intel->pEnt = pEnt;
+ 
+Index: xserver-xorg-video-intel-2.20.9/src/intel_driver.h
+===================================================================
+--- xserver-xorg-video-intel-2.20.9.orig/src/intel_driver.h	2012-10-30 02:54:05.456713161 +0100
++++ xserver-xorg-video-intel-2.20.9/src/intel_driver.h	2012-10-30 02:54:16.186075606 +0100
+@@ -277,9 +277,9 @@
+ 	int gen;
+ };
+ 
+-void intel_detect_chipset(ScrnInfoPtr scrn,
+-			  EntityInfoPtr ent,
+-			  struct pci_device *pci);
++const struct intel_device_info *
++intel_detect_chipset(ScrnInfoPtr scrn,
++		     EntityInfoPtr ent, struct pci_device *pci);
+ 
+ 
+ #endif /* INTEL_DRIVER_H */
+Index: xserver-xorg-video-intel-2.20.9/src/intel_module.c
+===================================================================
+--- xserver-xorg-video-intel-2.20.9.orig/src/intel_module.c	2012-10-30 02:54:05.456713161 +0100
++++ xserver-xorg-video-intel-2.20.9/src/intel_module.c	2012-10-30 02:54:16.186075606 +0100
+@@ -51,6 +51,8 @@
+ #include <xf86platformBus.h>
+ #endif
+ 
++static struct intel_device_info *chipset_info;
++
+ static const struct intel_device_info intel_generic_info = {
+ 	.gen = -1,
+ };
+@@ -315,10 +317,9 @@
+ 	{ 0, 0, 0 },
+ };
+ 
+-void
++const struct intel_device_info *
+ intel_detect_chipset(ScrnInfoPtr scrn,
+-		     EntityInfoPtr ent,
+-		     struct pci_device *pci)
++		     EntityInfoPtr ent, struct pci_device *pci)
+ {
+ 	MessageType from = X_PROBED;
+ 	const char *name = NULL;
+@@ -347,6 +348,7 @@
+ 	}
+ 
+ 	scrn->chipset = name;
++	return chipset_info;
+ }
+ 
+ /*
+@@ -481,6 +483,8 @@
+ 	PciChipsets intel_pci_chipsets[NUM_CHIPSETS];
+ 	unsigned i;
+ 
++	chipset_info = (void *)match_data;
++
+ 	if (!has_kernel_mode_setting(device)) {
+ #if KMS_ONLY
+ 		return FALSE;
+@@ -515,7 +519,6 @@
+ 	scrn->driverVersion = INTEL_VERSION;
+ 	scrn->driverName = INTEL_DRIVER_NAME;
+ 	scrn->name = INTEL_NAME;
+-	scrn->driverPrivate = (void *)(match_data | 1);
+ 	scrn->Probe = NULL;
+ 
+ #if !KMS_ONLY
+Index: xserver-xorg-video-intel-2.20.9/src/legacy/i810/i810_driver.c
+===================================================================
+--- xserver-xorg-video-intel-2.20.9.orig/src/legacy/i810/i810_driver.c	2012-10-30 02:54:05.456713161 +0100
++++ xserver-xorg-video-intel-2.20.9/src/legacy/i810/i810_driver.c	2012-10-30 02:54:16.186075606 +0100
+@@ -151,7 +151,7 @@
+ static Bool
+ I810GetRec(ScrnInfoPtr scrn)
+ {
+-   if (((uintptr_t)scrn->driverPrivate & 1) == 0)
++   if (scrn->driverPrivate)
+       return TRUE;
+ 
+    scrn->driverPrivate = xnfcalloc(sizeof(I810Rec), 1);
+Index: xserver-xorg-video-intel-2.20.9/src/sna/sna_driver.c
+===================================================================
+--- xserver-xorg-video-intel-2.20.9.orig/src/sna/sna_driver.c	2012-10-30 02:54:05.456713161 +0100
++++ xserver-xorg-video-intel-2.20.9/src/sna/sna_driver.c	2012-10-30 02:54:16.190077605 +0100
+@@ -407,15 +407,14 @@
+ 
+ 	sna_selftest();
+ 
+-	if (((uintptr_t)scrn->driverPrivate) & 1) {
++	sna = to_sna(scrn);
++	if (sna == NULL) {
+ 		sna = xnfcalloc(sizeof(struct sna), 1);
+ 		if (sna == NULL)
+ 			return FALSE;
+ 
+-		sna->info = (void *)((uintptr_t)scrn->driverPrivate & ~1);
+ 		scrn->driverPrivate = sna;
+ 	}
+-	sna = to_sna(scrn);
+ 	sna->scrn = scrn;
+ 	sna->pEnt = pEnt;
+ 
+@@ -465,7 +464,7 @@
+ 
+ 	sna_setup_capabilities(scrn, fd);
+ 
+-	intel_detect_chipset(scrn, sna->pEnt, sna->PciInfo);
++	sna->info = intel_detect_chipset(scrn, sna->pEnt, sna->PciInfo);
+ 
+ 	kgem_init(&sna->kgem, fd, sna->PciInfo, sna->info->gen);
+ 	if (xf86ReturnOptValBool(sna->Options, OPTION_ACCEL_DISABLE, FALSE)) {

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-10-01 15:39:54 +0000
+++ debian/patches/series	2013-01-04 01:46:21 +0000
@@ -1,1 +1,2 @@
 fix-glamor-check.diff
+fix-ati-hybrid.patch