1 files changed, 26 insertions, 0 deletions

diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 1696cc277d8b..d3a79e0a9125 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -289,8 +289,34 @@ void r600_set_power_state(struct radeon_device *rdev, bool static_switch)
                         }
 
                 } else {
+                        u32 position;
+                        u32 vbl;
+
                         radeon_sync_with_vblank(rdev);
 
+                        if (!radeon_pm_in_vbl(rdev))
+                                return;
+
+                        if (rdev->pm.active_crtcs & (1 << 0)) {
+                                vbl = RREG32(AVIVO_D1CRTC_V_BLANK_START_END);
+                                position = RREG32(AVIVO_D1CRTC_STATUS_POSITION);
+                                position &= 0xfff;
+                                vbl &= 0xfff;
+
+                                if (position < vbl && position > 1)
+                                        return;
+                        }
+
+                        if (rdev->pm.active_crtcs & (1 << 1)) {
+                                vbl = RREG32(AVIVO_D2CRTC_V_BLANK_START_END);
+                                position = RREG32(AVIVO_D2CRTC_STATUS_POSITION);
+                                position &= 0xfff;
+                                vbl &= 0xfff;
+
+                                if (position < vbl && position > 1)
+                                        return;
+                        }
+
                         if (sclk != rdev->pm.current_sclk) {
                                 radeon_pm_debug_check_in_vbl(rdev, false);
                                 radeon_set_engine_clock(rdev, sclk);