rpms/kernel/devel drm-page-flip.patch, 1.7, 1.8 kernel.spec, 1.1781, 1.1782

[Dave Airlie]

Author: airlied

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

Modified Files:
	drm-page-flip.patch kernel.spec 
Log Message:
* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.219.rc9.git
- uggh lost nouveau bits in page flip


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/drm_stub.c                            |    1 
 b/drivers/gpu/drm/i915/i915_drv.c                       |    1 
 b/drivers/gpu/drm/i915/intel_display.c                  |   26 +-
 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                                |   16 +
 linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c |    2 
 linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c |    2 
 16 files changed, 416 insertions(+), 16 deletions(-)

Index: drm-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-page-flip.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- drm-page-flip.patch	9 Sep 2009 09:09:31 -0000	1.7
+++ drm-page-flip.patch	9 Sep 2009 09:42:58 -0000	1.8
@@ -843,3 +843,27 @@ index 1f90841..6f08a77 100644
 +};
 +
  #endif
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.da linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-09-08 16:08:09.000000000 +1000
+@@ -993,7 +993,7 @@ nv04_crtc_create(struct drm_device *dev,
+ 	nv_crtc->index = crtc_num;
+ 	nv_crtc->last_dpms = NV_DPMS_CLEARED;
+ 
+-	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.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.da linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.da	2009-09-08 16:07:49.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c	2009-09-08 16:08:09.000000000 +1000
+@@ -777,7 +777,7 @@ nv50_crtc_create(struct drm_device *dev,
+ 	crtc->set_dither = nv50_crtc_set_dither;
+ 	crtc->set_scale = nv50_crtc_set_scale;
+ 
+-	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.1781
retrieving revision 1.1782
diff -u -p -r1.1781 -r1.1782
--- kernel.spec	9 Sep 2009 09:09:31 -0000	1.1781
+++ kernel.spec	9 Sep 2009 09:42:58 -0000	1.1782
@@ -2025,6 +2025,9 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.219.rc9.git
+- uggh lost nouveau bits in page flip
+
 * Wed Sep 09 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.218.rc9.git2
 - fix r600 oops with page flip patch (#520766)