commit ef6e6cf56aca91c0b0db8de6e79e0874595fd260
author Alex Deucher <alexdeucher@gmail.com> Wed Mar 17 14:29:15 2010 -0400
committer Dave Airlie <airlied@redhat.com> Tue May 18 18:20:50 2010 +1000
tree 7ea9b9f6fec371d13d9bf76d027ad3dd7273b954
parent 2031f77ca9c17133869b265210418959a909d259

drm/radeon/kms: wait for gpu idle before changing power mode

set proper wait condition as noted by Rafał Miłecki.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

drivers/gpu/drm/radeon/radeon_pm.c

diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 6dfeb9c..4ece89a 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -378,6 +378,16 @@
 	radeon_get_power_state(rdev, rdev->pm.planned_action);
 	mutex_lock(&rdev->cp.mutex);
 
+	/* wait for GPU idle */
+	rdev->pm.gui_idle = false;
+	rdev->irq.gui_idle = true;
+	radeon_irq_set(rdev);
+	wait_event_interruptible_timeout(
+		rdev->irq.idle_queue, rdev->pm.gui_idle,
+		msecs_to_jiffies(RADEON_WAIT_IDLE_TIMEOUT));
+	rdev->irq.gui_idle = false;
+	radeon_irq_set(rdev);
+
 	if (rdev->pm.active_crtcs & (1 << 0)) {
 		rdev->pm.req_vblank |= (1 << 0);
 		drm_vblank_get(rdev->ddev, 0);