aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Francis <[email protected]>2019-03-04 10:31:31 -0500
committerAlex Deucher <[email protected]>2019-03-20 23:39:48 -0500
commitb05e2c5e81f9a0be4a145e0926b1dfe62f6347d4 (patch)
treef5672b295684857adb22d0fe7b0124f3852641e6
parent3d5cc272319d6b7bf2e7d8aa9b1c3b0fe3e85b3f (diff)
drm/amd/display: Update ABM crtc state on non-modeset
[Why] Somewhere in the atomic check reshuffle ABM got lost. ABM is a crtc property (copied from a connector property). It can change without a modeset, just like underscan. [How] In the skip_modeset branch of atomic check crtc updates, copy over the abm property. Signed-off-by: David Francis <[email protected]> Reviewed-by: Nicholas Kazlauskas <[email protected]> Acked-by: Bhawanpreet Lakha <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c3
1 files changed, 3 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 322216d7ccfe..8b5fc420d1c1 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -5689,6 +5689,9 @@ skip_modeset:
update_stream_scaling_settings(
&new_crtc_state->mode, dm_new_conn_state, dm_new_crtc_state->stream);
+ /* ABM settings */
+ dm_new_crtc_state->abm_level = dm_new_conn_state->abm_level;
+
/*
* Color management settings. We also update color properties
* when a modeset is needed, to ensure it gets reprogrammed.