rpms/kernel/devel drm-radeon-fix-crtc-vbl-update-for-r600.patch, NONE, 1.1 kernel.spec, 1.1877, 1.1878

[Kyle McMartin]

Author: kyle

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

Modified Files:
	kernel.spec 
Added Files:
	drm-radeon-fix-crtc-vbl-update-for-r600.patch 
Log Message:
* Thu Dec 24 2009 Kyle McMartin <kyle at redhat.com> 2.6.32.2-15
- Add patch from dri-devel to fix vblanks on r600.
  [http://marc.info/?l=dri-devel&m=126137027403059&w=2]


drm-radeon-fix-crtc-vbl-update-for-r600.patch:
 atombios_crtc.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE drm-radeon-fix-crtc-vbl-update-for-r600.patch ---
--- linux-2.6.32.noarch/drivers/gpu/drm/radeon/atombios_crtc.c
+++ linux-2.6.32.noarch/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -249,13 +249,15 @@ void atombios_crtc_dpms(struct drm_crtc 
 		if (ASIC_IS_DCE3(rdev))
 			atombios_enable_crtc_memreq(crtc, 1);
 		atombios_blank_crtc(crtc, 0);
-		drm_vblank_post_modeset(dev, radeon_crtc->crtc_id);
+		if (rdev->family < CHIP_R600)
+			drm_vblank_post_modeset(dev, radeon_crtc->crtc_id);
 		radeon_crtc_load_lut(crtc);
 		break;
 	case DRM_MODE_DPMS_STANDBY:
 	case DRM_MODE_DPMS_SUSPEND:
 	case DRM_MODE_DPMS_OFF:
-		drm_vblank_pre_modeset(dev, radeon_crtc->crtc_id);
+		if (rdev->family < CHIP_R600)
+			drm_vblank_pre_modeset(dev, radeon_crtc->crtc_id);
 		atombios_blank_crtc(crtc, 1);
 		if (ASIC_IS_DCE3(rdev))
 			atombios_enable_crtc_memreq(crtc, 0);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1877
retrieving revision 1.1878
diff -u -p -r1.1877 -r1.1878
--- kernel.spec	19 Dec 2009 02:35:33 -0000	1.1877
+++ kernel.spec	24 Dec 2009 17:00:52 -0000	1.1878
@@ -695,6 +695,7 @@ Patch1821: drm-page-flip.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1827: linux-2.6-intel-agp-clear-gtt.patch
+Patch1828: drm-radeon-fix-crtc-vbl-update-for-r600.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1323,6 +1324,7 @@ ApplyOptionalPatch drm-intel-next.patch
 #ApplyPatch drm-intel-pm.patch
 # Some BIOSes don't clear the whole GTT, and it causes IOMMU faults
 ApplyPatch linux-2.6-intel-agp-clear-gtt.patch
+ApplyPatch drm-radeon-fix-crtc-vbl-update-for-r600.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1995,6 +1997,10 @@ fi
 # and build.
 
 %changelog
+* Thu Dec 24 2009 Kyle McMartin <kyle at redhat.com> 2.6.32.2-15
+- Add patch from dri-devel to fix vblanks on r600.
+  [http://marc.info/?l=dri-devel&m=126137027403059&w=2]
+
 * Fri Dec 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.32.2-14
 - Linux 2.6.32.2
 - dropped upstream patches.