https://bugzilla.novell.com/show_bug.cgi?id=687802
https://bugzilla.novell.com/show_bug.cgi?id=687802#c6
--- Comment #6 from Stefan Dirsch 2011-04-16 06:19:00 UTC ---
James adjusted the patch. Egbert, could you do a review? SR #67614
-> osc request show -d 67614
--- xorg-x11-driver-video.changes
+++ xorg-x11-driver-video.changes
@@ -2 +2 @@
-Fri Apr 15 19:51:42 UTC 2011 - sndirsch@novell.com
+Fri Apr 15 16:00:00 CDT 2011 - James.Bottomley@suse.de
@@ -4 +4,3 @@
-- disabled xf86-video-intel-copyfb.diff for now (bnc #687802)
+- xf86-video-intel-copyfb.diff
+ * update patch for change to batch flushing: new auto detect fails
+ with the copyfb patch because screen is NULL. Return true in that case
--- xorg-x11-driver-video.spec
+++ xorg-x11-driver-video.spec
@@ -160,8 +160,7 @@
pushd xf86-video-intel-*
%patch130 -p0
%patch150 -p1
-### disabled for now (bnc #687802)
-#%patch155 -p1
+%patch155 -p1
popd
pushd xf86-video-nv-*
%patch132 -p1
--- xf86-video-intel-copyfb.diff
+++ xf86-video-intel-copyfb.diff
[...]
+diff --git a/src/intel_batchbuffer.c b/src/intel_batchbuffer.c
+index 289ed2b..84f9f30 100644
+--- a/src/intel_batchbuffer.c
++++ b/src/intel_batchbuffer.c
+@@ -178,7 +178,11 @@ void intel_batch_emit_flush(ScrnInfoPtr scrn)
+ static Bool intel_batch_needs_flush(intel_screen_private *intel)
+ {
+ ScreenPtr screen = intel->scrn->pScreen;
+- PixmapPtr pixmap = screen->GetScreenPixmap(screen);
++ PixmapPtr pixmap;
++
++ if (!screen)
++ return TRUE;
++ pixmap = screen->GetScreenPixmap(screen);
+ return intel_get_pixmap_private(pixmap)->batch_write;
+ }
+
[..]
--
Configure bugmail: https://bugzilla.novell.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.