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>
This commit is contained in:

committed by
Dave Airlie

parent
612e06ce9c
commit
f81f202402
@@ -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);
|
||||
|
Reference in New Issue
Block a user