drm/amd/display: Update color props when modeset is required

This fixes issues where color management properties don't persist
over DPMS on/off, or when the CRTC is moved across connectors.

Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 1a7e96ee6051b3d3d5704e756382ac8862a7fdab..27579443cdc5a72935fb7f9dd05682be5b637cea 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4717,8 +4717,12 @@ next_crtc:
                        update_stream_scaling_settings(
                                &new_crtc_state->mode, dm_new_conn_state, dm_new_crtc_state->stream);
 
-               /* Color managment settings */
-               if (dm_new_crtc_state->base.color_mgmt_changed) {
+               /*
+                * Color management settings. We also update color properties
+                * when a modeset is needed, to ensure it gets reprogrammed.
+                */
+               if (dm_new_crtc_state->base.color_mgmt_changed ||
+                   drm_atomic_crtc_needs_modeset(new_crtc_state)) {
                        ret = amdgpu_dm_set_regamma_lut(dm_new_crtc_state);
                        if (ret)
                                goto fail;