diff options
| author | Leo (Sunpeng) Li | 2017-10-18 20:22:23 +0200 |
|---|---|---|
| committer | Alex Deucher | 2017-12-04 22:41:29 +0100 |
| commit | 1c77d4eea7c7c441214c6f30416c7ee16f921fb0 (patch) | |
| tree | f6fa4941be885c81cd5069b1fa6b570253cf0b12 | |
| parent | drm/amd/display: Cleanup code that enables freesync (diff) | |
| download | kernel-qcow2-linux-1c77d4eea7c7c441214c6f30416c7ee16f921fb0.tar.gz kernel-qcow2-linux-1c77d4eea7c7c441214c6f30416c7ee16f921fb0.tar.xz kernel-qcow2-linux-1c77d4eea7c7c441214c6f30416c7ee16f921fb0.zip | |
drm/amd/display: Only add stream to freesync when modeset required
This is a follow-up patch to:
Leo (Sunpeng) Li Cleanup code that enables freesync
We should only add a stream to freesync if a modeset was requested, so
we don't fill the core freesync map with pointless streams.
Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 28 |
1 files changed, 21 insertions, 7 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 816aa426ddd3..f4bebdc60351 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4132,12 +4132,28 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) * are removed from freesync module */ if (adev->dm.freesync_module) { - for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) { + for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { struct amdgpu_dm_connector *aconnector = NULL; struct dm_connector_state *dm_new_con_state = NULL; struct amdgpu_crtc *acrtc = NULL; + bool modeset_needed; dm_new_crtc_state = to_dm_crtc_state(new_crtc_state); + dm_old_crtc_state = to_dm_crtc_state(old_crtc_state); + modeset_needed = modeset_required( + new_crtc_state, + dm_new_crtc_state->stream, + dm_old_crtc_state->stream); + /* We add stream to freesync if: + * 1. Said stream is not null, and + * 2. A modeset is requested. This means that the + * stream was removed previously, and needs to be + * replaced. + */ + if (dm_new_crtc_state->stream == NULL || + !modeset_needed) + continue; + acrtc = to_amdgpu_crtc(crtc); aconnector = @@ -4157,12 +4173,10 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) state, &aconnector->base); dm_new_con_state = to_dm_connector_state(new_con_state); - if (dm_new_crtc_state->stream) { - mod_freesync_set_user_enable(adev->dm.freesync_module, - &dm_new_crtc_state->stream, - 1, - &dm_new_con_state->user_enable); - } + mod_freesync_set_user_enable(adev->dm.freesync_module, + &dm_new_crtc_state->stream, + 1, + &dm_new_con_state->user_enable); } } |