summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBhawanpreet Lakha2017-10-16 21:51:00 +0200
committerAlex Deucher2017-12-04 22:41:28 +0100
commitbfe1708c80d5d7cf08b7907b1850d2d3bf688db2 (patch)
tree6ddd5dd449db760e8cedc381d97997cfcd5bdedb
parentdrm/amd/display: add mod_freesync_user_enable to dm_connector_state (diff)
downloadkernel-qcow2-linux-bfe1708c80d5d7cf08b7907b1850d2d3bf688db2.tar.gz
kernel-qcow2-linux-bfe1708c80d5d7cf08b7907b1850d2d3bf688db2.tar.xz
kernel-qcow2-linux-bfe1708c80d5d7cf08b7907b1850d2d3bf688db2.zip
drm/amd/display: Atomic freesync ASSERT fix
Changes to atomic set property for freesync. Now In set property, just set the freesync variables and return 0. Based on the variables call mod_freesync_set_user_enable() inside commit_tail Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> Acked-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.c27
1 files changed, 27 insertions, 0 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 b2359bc4900d..e99ba554f5b9 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4154,6 +4154,33 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
mod_freesync_add_stream(adev->dm.freesync_module,
new_stream, &aconnector->caps);
}
+
+ list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+
+ struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc);
+ struct amdgpu_dm_connector *aconnector = NULL;
+ struct dm_connector_state *conn_state = NULL;
+ struct dm_crtc_state *acrtc_state = NULL;
+
+ acrtc_state = to_dm_crtc_state(acrtc->base.state);
+
+
+ aconnector =
+ amdgpu_dm_find_first_crtc_matching_connector(
+ state,
+ crtc,
+ false);
+ if (aconnector) {
+ conn_state = to_dm_connector_state(aconnector->base.state);
+
+ if (new_stream) {
+ mod_freesync_set_user_enable(adev->dm.freesync_module,
+ &acrtc_state->stream,
+ 1,
+ &conn_state->user_enable);
+ }
+ }
+ }
}
if (dm_state->context)