diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-03-29 10:18:24 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-03-29 10:18:28 +1000 |
| commit | ee41c2db09f7065fc56c3b20b3f010d9f2d46280 (patch) | |
| tree | 91437b7dce1dfe010888e5f7d8d41fc7d7a16776 /drivers/gpu | |
| parent | de53874a0f704a2b98c960d88b7bf91d2cf7b3ce (diff) | |
| parent | 0ab925d3690614aa44cd29fb84cdcef03eab97dc (diff) | |
| download | linux-ee41c2db09f7065fc56c3b20b3f010d9f2d46280.tar.gz linux-ee41c2db09f7065fc56c3b20b3f010d9f2d46280.tar.bz2 linux-ee41c2db09f7065fc56c3b20b3f010d9f2d46280.zip | |
Merge branch 'drm-fixes-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
- One freesync/VRR fix.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190328033124.26009-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index fb27783d7a54..81127f7d6ed1 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5429,9 +5429,11 @@ static void get_freesync_config_for_crtc( struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(new_con_state->base.connector); struct drm_display_mode *mode = &new_crtc_state->base.mode; + int vrefresh = drm_mode_vrefresh(mode); new_crtc_state->vrr_supported = new_con_state->freesync_capable && - aconnector->min_vfreq <= drm_mode_vrefresh(mode); + vrefresh >= aconnector->min_vfreq && + vrefresh <= aconnector->max_vfreq; if (new_crtc_state->vrr_supported) { new_crtc_state->stream->ignore_msa_timing_param = true; |