diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2017-06-23 15:55:15 +0200 |
|---|---|---|
| committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2017-06-23 15:55:15 +0200 |
| commit | 5315486b2da90bcfa1ce5c791aafebb4c3534cf1 (patch) | |
| tree | c3c215962edb82708210606574417efc1b84abe0 /drivers/gpu/drm/amd | |
| parent | 351dce074b70b19c7f8b1b737a862577e822a508 (diff) | |
| parent | 050639ef5810e8ad17fb6a426eff3c63e616350c (diff) | |
| download | linux-rt-5315486b2da90bcfa1ce5c791aafebb4c3534cf1.tar.gz | |
Merge tag 'v4.9.33' into linux-4.9.y-rt
This is the 4.9.33 stable release
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c index 5be788b269e2..1679727c22ef 100644 --- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c +++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c @@ -900,6 +900,12 @@ static bool ci_dpm_vblank_too_short(struct amdgpu_device *adev) u32 vblank_time = amdgpu_dpm_get_vblank_time(adev); u32 switch_limit = adev->mc.vram_type == AMDGPU_VRAM_TYPE_GDDR5 ? 450 : 300; + /* disable mclk switching if the refresh is >120Hz, even if the + * blanking period would allow it + */ + if (amdgpu_dpm_get_vrefresh(adev) > 120) + return true; + if (vblank_time < switch_limit) return true; else |