rpms/xorg-x11-drv-intel/devel copy-fb.patch, 1.2, 1.3 xorg-x11-drv-intel.spec, 1.7, 1.8

[Kristian Høgsberg]

Author: krh

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

Modified Files:
	copy-fb.patch xorg-x11-drv-intel.spec 
Log Message:
* Thu Mar  5 2009 Kristian Høgsberg <krh at redhat.com> - 2.6.0-14
- Fix copy-fb patch to skip dpms off on initial modeset.
- Downgrade the conflicts to a requires.


copy-fb.patch:

Index: copy-fb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/copy-fb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- copy-fb.patch	25 Feb 2009 03:43:11 -0000	1.2
+++ copy-fb.patch	5 Mar 2009 22:58:57 -0000	1.3
@@ -1,6 +1,13 @@
-diff -up xf86-video-intel-2.6.0/src/drmmode_display.c.copy-fb xf86-video-intel-2.6.0/src/drmmode_display.c
---- xf86-video-intel-2.6.0/src/drmmode_display.c.copy-fb	2009-02-24 21:43:59.000000000 -0500
-+++ xf86-video-intel-2.6.0/src/drmmode_display.c	2009-02-24 22:10:51.000000000 -0500
+commit b209cbc72f8d524b2c4c6d0e6e6acf8385e96062
+Author: Kristian Høgsberg <krh at redhat.com>
+Date:   Tue Feb 24 10:49:45 2009 -0500
+
+    Copy initial framebuffer contents when starting with -br.
+
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index df0f1a2..35dc24c 100644
+--- a/src/drmmode_display.c
++++ b/src/drmmode_display.c
 @@ -29,6 +29,8 @@
  #include "config.h"
  #endif
@@ -10,7 +17,7 @@
  #include "xorgVersion.h"
  
  #ifdef XF86DRM_MODE
-@@ -145,7 +147,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
+@@ -145,7 +147,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  	unsigned int pitch = pScrn->displayWidth * pI830->cpp;
  
  	if (drmmode->fb_id == 0) {
@@ -19,7 +26,21 @@
  				   pScrn->virtualX, pScrn->virtualY,
  				   pScrn->depth, pScrn->bitsPerPixel,
  				   pitch, pI830->front_buffer->bo->handle,
-@@ -733,6 +735,8 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
+@@ -523,6 +525,13 @@ drmmode_output_dpms(xf86OutputPtr output, int mode)
+ 	drmmode_ptr drmmode = drmmode_output->drmmode;
+ 	int i;
+ 	drmModePropertyPtr props;
++	I830Ptr     pI830 = I830PTR(output->scrn);
++
++	/* xf86Crtc.c calls dpms off in set desired modes, so ignore
++	 * the request if we're starting up. */
++
++	if (pI830->starting)
++		return;
+ 
+ 	for (i = 0; i < koutput->count_props; i++) {
+ 		props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
+@@ -753,6 +762,8 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
  
  	xf86InitialConfiguration(pScrn, pI830->can_resize);
  
@@ -28,7 +49,7 @@
  	return TRUE;
  }
  
-@@ -760,4 +764,96 @@ Bool drmmode_is_rotate_pixmap(ScrnInfoPt
+@@ -780,4 +791,97 @@ Bool drmmode_is_rotate_pixmap(ScrnInfoPtr pScrn, pointer pPixData, dri_bo **bo)
  #endif
  }
  
@@ -48,9 +69,10 @@
 +
 +	for (i = 0; i < drmmode->mode_res->count_crtcs; i++) {
 +		drmmode_crtc = xf86_config->crtc[i]->driver_private;
-+		fbcon = drmModeGetFB(drmmode->fd, drmmode_crtc->mode_crtc->buffer_id);
-+		ErrorF("buffer_id: %d, fbcon: %p\n",
-+		       drmmode_crtc->mode_crtc->buffer_id, fbcon);
++		if (drmmode_crtc->mode_crtc->buffer_id == 0)
++			continue;
++		fbcon = drmModeGetFB(drmmode->fd,
++				     drmmode_crtc->mode_crtc->buffer_id);
 +		if (fbcon != NULL)
 +			break;
 +	}
@@ -125,10 +147,23 @@
 +}
 +
  #endif
-diff -up xf86-video-intel-2.6.0/src/i830_driver.c.copy-fb xf86-video-intel-2.6.0/src/i830_driver.c
---- xf86-video-intel-2.6.0/src/i830_driver.c.copy-fb	2009-02-24 21:43:59.000000000 -0500
-+++ xf86-video-intel-2.6.0/src/i830_driver.c	2009-02-24 21:43:59.000000000 -0500
-@@ -3690,6 +3690,8 @@ I830EnterVT(int scrnIndex, int flags)
+diff --git a/src/i830.h b/src/i830.h
+index cd9c38a..8651169 100644
+--- a/src/i830.h
++++ b/src/i830.h
+@@ -835,6 +835,7 @@ void I830DRI2CloseScreen(ScreenPtr pScreen);
+ extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
+ extern Bool drmmode_is_rotate_pixmap(ScrnInfoPtr pScrn, pointer pPixData,
+ 				     dri_bo **bo);
++extern void drmmode_copy_fb(ScrnInfoPtr pScrn);
+ #endif
+ 
+ extern Bool I830AccelInit(ScreenPtr pScreen);
+diff --git a/src/i830_driver.c b/src/i830_driver.c
+index f80ca69..0591db9 100644
+--- a/src/i830_driver.c
++++ b/src/i830_driver.c
+@@ -3725,6 +3725,8 @@ I830EnterVT(int scrnIndex, int flags)
         /* Clear the framebuffer */
         memset(pI830->FbBase + pScrn->fbOffset, 0,
  	      pScrn->virtualY * pScrn->displayWidth * pI830->cpp);
@@ -137,14 +172,3 @@
     }
  
     if (!xf86SetDesiredModes (pScrn))
-diff -up xf86-video-intel-2.6.0/src/i830.h.copy-fb xf86-video-intel-2.6.0/src/i830.h
---- xf86-video-intel-2.6.0/src/i830.h.copy-fb	2009-02-24 21:43:59.000000000 -0500
-+++ xf86-video-intel-2.6.0/src/i830.h	2009-02-24 21:43:59.000000000 -0500
-@@ -832,6 +832,7 @@ void I830DRI2CloseScreen(ScreenPtr pScre
- extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
- extern Bool drmmode_is_rotate_pixmap(ScrnInfoPtr pScrn, pointer pPixData,
- 				     dri_bo **bo);
-+extern void drmmode_copy_fb(ScrnInfoPtr pScrn);
- #endif
- 
- extern Bool I830AccelInit(ScreenPtr pScreen);


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-intel.spec	5 Mar 2009 14:45:16 -0000	1.7
+++ xorg-x11-drv-intel.spec	5 Mar 2009 22:58:57 -0000	1.8
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-intel
 Version:   2.6.0
-Release:   13%{?dist}
+Release:   14%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -40,8 +40,7 @@
 Requires:  xorg-x11-server-Xorg >= 1.4.99.1
 
 Conflicts:  kudzu < 1.2.42-1
-Conflicts:  kernel < 2.6.29-0.207.rc7.fc11
-Conflicts:  kernel-PAE < 2.6.29-0.207.rc7.fc11
+Requires:  kernel >= 2.6.29-0.203.rc7.fc11
 Provides:   %{legacyname} = %{legacyver}
 Obsoletes:  %{legacyname} < %{legacyver}
 
@@ -105,6 +104,10 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Thu Mar  5 2009 Kristian Høgsberg <krh at redhat.com> - 2.6.0-14
+- Fix copy-fb patch to skip dpms off on initial modeset.
+- Downgrade the conflicts to a requires.
+
 * Thu Mar  5 2009 Kristian Høgsberg <krh at redhat.com> - 2.6.0-13
 - Add conflicts to make sure we have a new enough kernel that
   drmSetMaster() doesn't deadlock.