Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc13f2f8 authored by Leo (Sunpeng) Li's avatar Leo (Sunpeng) Li Committed by Alex Deucher
Browse files

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: default avatarLeo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a9e8d275

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+6 −2
Original line number Diff line number Diff line
@@ -4717,8 +4717,12 @@ static int dm_update_crtcs_state(struct dc *dc, 
			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;