rpms/kernel/devel drm-page-flip.patch, 1.1, 1.2 kernel.spec, 1.1656, 1.1657

[Kristian Høgsberg]

Author: krh

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29596

Modified Files:
	drm-page-flip.patch kernel.spec 
Log Message:
* Fri Jul 24 2009 Kristian Høgsberg <krh at redhat.com>
- Add drm-page-flip.patch to support vsynced page flipping on intel
  chipsets.
- Really add patch.
- Fix patch to not break nouveau.


drm-page-flip.patch:
 b/drivers/gpu/drm/drm_crtc.c                          |  169 +++++++++++++++++-
 b/drivers/gpu/drm/drm_crtc_helper.c                   |   12 +
 b/drivers/gpu/drm/drm_drv.c                           |    1 
 b/drivers/gpu/drm/drm_fops.c                          |   68 +++++++
 b/drivers/gpu/drm/drm_irq.c                           |   43 ++++
 b/drivers/gpu/drm/i915/i915_drv.c                     |    1 
 b/drivers/gpu/drm/i915/intel_display.c                |   24 +-
 b/drivers/gpu/drm/radeon/atombios_crtc.c              |    1 
 b/drivers/gpu/drm/radeon/radeon_display.c             |    3 
 b/include/drm/drm.h                                   |   25 ++
 b/include/drm/drmP.h                                  |   32 +++
 b/include/drm/drm_crtc.h                              |   27 ++
 b/include/drm/drm_crtc_helper.h                       |    4 
 b/include/drm/drm_mode.h                              |   17 +
 linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c |    2 
 linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c |    2 
 16 files changed, 415 insertions(+), 16 deletions(-)

Index: drm-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-page-flip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drm-page-flip.patch	24 Jul 2009 23:43:14 -0000	1.1
+++ drm-page-flip.patch	26 Jul 2009 22:11:09 -0000	1.2
@@ -877,3 +877,27 @@ index ae304cc..464b779 100644
 -- 
 1.6.3.3
 
+diff -up linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c~ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c
+--- linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c~	2009-07-24 19:38:36.000000000 -0400
++++ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-07-26 18:06:06.000000000 -0400
+@@ -1014,7 +1014,7 @@ nv04_crtc_create(struct drm_device *dev,
+ 	nv_crtc->mode_set.connectors = (struct drm_connector **)(nv_crtc + 1);
+ 	nv_crtc->mode_set.num_connectors = 0;
+ 
+-	drm_crtc_init(dev, &nv_crtc->base, &nv04_crtc_funcs);
++	drm_crtc_init(dev, &nv_crtc->base, crtc_num, &nv04_crtc_funcs);
+ 	drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);
+ 	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);
+ 
+diff -up linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c~ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c
+--- linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c~	2009-07-24 19:38:36.000000000 -0400
++++ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c	2009-07-26 18:06:23.000000000 -0400
+@@ -796,7 +796,7 @@ nv50_crtc_create(struct drm_device *dev,
+ 	crtc->mode_set.connectors = (struct drm_connector **)(crtc + 1);
+ 	crtc->mode_set.num_connectors = 0;
+ 
+-	drm_crtc_init(dev, &crtc->base, &nv50_crtc_funcs);
++	drm_crtc_init(dev, &crtc->base, index, &nv50_crtc_funcs);
+ 	drm_crtc_helper_add(&crtc->base, &nv50_crtc_helper_funcs);
+ 	drm_mode_crtc_set_gamma_size(&crtc->base, 256);
+ 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1656
retrieving revision 1.1657
diff -u -p -r1.1656 -r1.1657
--- kernel.spec	24 Jul 2009 23:49:46 -0000	1.1656
+++ kernel.spec	26 Jul 2009 22:11:10 -0000	1.1657
@@ -1896,6 +1896,7 @@ fi
 - Add drm-page-flip.patch to support vsynced page flipping on intel
   chipsets.
 - Really add patch.
+- Fix patch to not break nouveau.
 
 * Fri Jul 24 2009 Chuck Ebbert <cebbert at redhat.com>
 - Enable CONFIG_DEBUG_KOBJECT in debug kernels. (#513606)