rpms/xorg-x11-drv-intel/devel copy-fb.patch, 1.6, 1.7 xorg-x11-drv-intel.spec, 1.32, 1.33

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19301

Modified Files:
	copy-fb.patch xorg-x11-drv-intel.spec 
Log Message:
* Thu Sep 24 2009 Dave Airlie <airlied at redhat.com> 2.8.0-16.20090909
- Attempt to make -nr work again


copy-fb.patch:
 drmmode_display.c |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 i830.h            |    1 
 i830_driver.c     |    2 
 3 files changed, 111 insertions(+), 1 deletion(-)

Index: copy-fb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/copy-fb.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- copy-fb.patch	8 Sep 2009 18:38:52 -0000	1.6
+++ copy-fb.patch	23 Sep 2009 23:32:26 -0000	1.7
@@ -1,6 +1,6 @@
-diff -up xf86-video-intel-20090908/src/drmmode_display.c.jx xf86-video-intel-20090908/src/drmmode_display.c
---- xf86-video-intel-20090908/src/drmmode_display.c.jx	2009-09-08 14:29:35.000000000 -0400
-+++ xf86-video-intel-20090908/src/drmmode_display.c	2009-09-08 14:29:52.000000000 -0400
+diff -up xf86-video-intel-20090909/src/drmmode_display.c.copy-fb xf86-video-intel-20090909/src/drmmode_display.c
+--- xf86-video-intel-20090909/src/drmmode_display.c.copy-fb	2009-09-24 09:30:40.000000000 +1000
++++ xf86-video-intel-20090909/src/drmmode_display.c	2009-09-24 09:30:56.000000000 +1000
 @@ -35,6 +35,8 @@
  #include <unistd.h>
  #include <errno.h>
@@ -42,7 +42,15 @@ diff -up xf86-video-intel-20090908/src/d
  	return TRUE;
  
   fail:
-@@ -1422,3 +1433,98 @@ drmmode_get_pipe_from_crtc_id(drm_intel_
+@@ -1402,6 +1413,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
+ 		return FALSE;
+ 	}
+ 
++	scrn->canDoBGNoneRoot = TRUE;
+ 	xf86CrtcSetSizeRange(pScrn, 320, 200, drmmode->mode_res->max_width,
+ 			     drmmode->mode_res->max_height);
+ 	for (i = 0; i < drmmode->mode_res->count_crtcs; i++)
+@@ -1422,3 +1434,98 @@ drmmode_get_pipe_from_crtc_id(drm_intel_
  
  	return drm_intel_get_pipe_from_crtc_id (bufmgr, drmmode_crtc->mode_crtc->crtc_id);
  }
@@ -141,10 +149,10 @@ diff -up xf86-video-intel-20090908/src/d
 +	(*pScreen->DestroyPixmap)(dst);
 +}
 +
-diff -up xf86-video-intel-20090908/src/i830_driver.c.jx xf86-video-intel-20090908/src/i830_driver.c
---- xf86-video-intel-20090908/src/i830_driver.c.jx	2009-09-05 06:06:44.000000000 -0400
-+++ xf86-video-intel-20090908/src/i830_driver.c	2009-09-08 14:29:52.000000000 -0400
-@@ -3049,6 +3049,8 @@ I830EnterVT(int scrnIndex, int flags)
+diff -up xf86-video-intel-20090909/src/i830_driver.c.copy-fb xf86-video-intel-20090909/src/i830_driver.c
+--- xf86-video-intel-20090909/src/i830_driver.c.copy-fb	2009-09-09 21:40:15.000000000 +1000
++++ xf86-video-intel-20090909/src/i830_driver.c	2009-09-24 09:30:40.000000000 +1000
+@@ -3054,6 +3054,8 @@ I830EnterVT(int scrnIndex, int flags)
         /* Clear the framebuffer */
         memset(pI830->FbBase + pScrn->fbOffset, 0,
  	      pScrn->virtualY * pScrn->displayWidth * pI830->cpp);
@@ -153,10 +161,10 @@ diff -up xf86-video-intel-20090908/src/i
     }
  
     if (!xf86SetDesiredModes (pScrn))
-diff -up xf86-video-intel-20090908/src/i830.h.jx xf86-video-intel-20090908/src/i830.h
---- xf86-video-intel-20090908/src/i830.h.jx	2009-09-05 06:06:44.000000000 -0400
-+++ xf86-video-intel-20090908/src/i830.h	2009-09-08 14:30:14.000000000 -0400
-@@ -693,6 +693,7 @@ void I830DRI2CloseScreen(ScreenPtr pScre
+diff -up xf86-video-intel-20090909/src/i830.h.copy-fb xf86-video-intel-20090909/src/i830.h
+--- xf86-video-intel-20090909/src/i830.h.copy-fb	2009-09-09 21:40:15.000000000 +1000
++++ xf86-video-intel-20090909/src/i830.h	2009-09-24 09:30:40.000000000 +1000
+@@ -694,6 +694,7 @@ void I830DRI2CloseScreen(ScreenPtr pScre
  extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
  extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
  extern int drmmode_output_dpms_status(xf86OutputPtr output);


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- xorg-x11-drv-intel.spec	18 Sep 2009 19:19:28 -0000	1.32
+++ xorg-x11-drv-intel.spec	23 Sep 2009 23:32:26 -0000	1.33
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   15.%{gitdate}%{?dist}
+Release:   16.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Thu Sep 24 2009 Dave Airlie <airlied at redhat.com> 2.8.0-16.20090909
+- Attempt to make -nr work again
+
 * Fri Sep 18 2009 Adam Jackson <ajax at redhat.com> 2.8.0-15.20090909
 - lvds-modes.patch: Fix to work in more cases.