aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_pm.c
diff options
context:
space:
mode:
authorMatthew Garrett <mjg@redhat.com>2010-04-28 12:13:06 -0400
committerDave Airlie <airlied@redhat.com>2010-05-18 04:21:29 -0400
commitf81f202402640c27b38e1452dcb4d3e447043f48 (patch)
tree7f081e491e256d792c7b9c5e9df817894227fe05 /drivers/gpu/drm/radeon/radeon_pm.c
parent612e06ce9c78840c3a1a207dfbe489a059d87c28 (diff)
radeon: Try harder to ensure we reclock in vblank
The vblank interrupt on r600 doesn't seem to be especially reliable, so perform some sanity checks before the actual reclock. Signed-off-by: Matthew Garrett <mjg@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_pm.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_pm.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 134b19537d11..88163e043fcf 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -387,7 +387,7 @@ void radeon_pm_compute_clocks(struct radeon_device *rdev)
387 mutex_unlock(&rdev->pm.mutex); 387 mutex_unlock(&rdev->pm.mutex);
388} 388}
389 389
390bool radeon_pm_debug_check_in_vbl(struct radeon_device *rdev, bool finish) 390bool radeon_pm_in_vbl(struct radeon_device *rdev)
391{ 391{
392 u32 stat_crtc = 0; 392 u32 stat_crtc = 0;
393 bool in_vbl = true; 393 bool in_vbl = true;
@@ -446,6 +446,15 @@ bool radeon_pm_debug_check_in_vbl(struct radeon_device *rdev, bool finish)
446 in_vbl = false; 446 in_vbl = false;
447 } 447 }
448 } 448 }
449
450 return in_vbl;
451}
452
453bool radeon_pm_debug_check_in_vbl(struct radeon_device *rdev, bool finish)
454{
455 u32 stat_crtc = 0;
456 bool in_vbl = radeon_pm_in_vbl(rdev);
457
449 if (in_vbl == false) 458 if (in_vbl == false)
450 DRM_INFO("not in vbl for pm change %08x at %s\n", stat_crtc, 459 DRM_INFO("not in vbl for pm change %08x at %s\n", stat_crtc,
451 finish ? "exit" : "entry"); 460 finish ? "exit" : "entry");