diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-05-30 07:54:15 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-05-30 07:54:15 +0200 |
| commit | 2a1720376adda5ecf8e636fbfb05339c7dad1c55 (patch) | |
| tree | cdb76abac82306516aa556d9e9ddb15571f07517 /drivers/gpu/drm/radeon/ci_dpm.c | |
| parent | Merge tag 'drm-intel-next-2017-05-29' of git://anongit.freedesktop.org/git/dr... (diff) | |
| parent | Linux 4.12-rc3 (diff) | |
| download | linux-2a1720376adda5ecf8e636fbfb05339c7dad1c55.tar.xz linux-2a1720376adda5ecf8e636fbfb05339c7dad1c55.zip | |
Backmerge tag 'v4.12-rc3' into drm-next
Linux 4.12-rc3
Daniel has requested this for some drm-intel-next work.
Diffstat (limited to 'drivers/gpu/drm/radeon/ci_dpm.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/ci_dpm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c index f0cf99783c62..c97fbb2ab48b 100644 --- a/drivers/gpu/drm/radeon/ci_dpm.c +++ b/drivers/gpu/drm/radeon/ci_dpm.c @@ -776,6 +776,12 @@ bool ci_dpm_vblank_too_short(struct radeon_device *rdev) u32 vblank_time = r600_dpm_get_vblank_time(rdev); u32 switch_limit = pi->mem_gddr5 ? 450 : 300; + /* disable mclk switching if the refresh is >120Hz, even if the + * blanking period would allow it + */ + if (r600_dpm_get_vrefresh(rdev) > 120) + return true; + if (vblank_time < switch_limit) return true; else |