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

[net-next-2.6.git] / 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 a4b57493aa78cca3809558f3a428262f389a7837..4ece89aa26f842b7f5ed28ff2a0522c16ffbc45b 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -27,6 +27,7 @@
 #define RADEON_IDLE_LOOP_MS 100
 #define RADEON_RECLOCK_DELAY_MS 200
 #define RADEON_WAIT_VBLANK_TIMEOUT 200
+#define RADEON_WAIT_IDLE_TIMEOUT 200
 
 static bool radeon_pm_debug_check_in_vbl(struct radeon_device *rdev, bool finish);
 static void radeon_pm_set_clocks_locked(struct radeon_device *rdev);
@@ -377,6 +378,16 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev)
        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);