Commit 2f9c6388 authored by Melissa Wen's avatar Melissa Wen Committed by Alex Deucher
Browse files

drm/amd/display: update color on atomic commit time 

Use `atomic_commit_setup` to change the DC stream state. It's a
preparation to remove from `atomic_check` changes in CRTC color
components of DC stream state and prevent DC to commit TEST_ONLY
changes.

Link: https://gitlab.freedesktop.org/drm/amd/-/issues/4444


Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarMelissa Wen <mwen@igalia.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cceb5422

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

+35 −1
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ static int amdgpu_dm_encoder_init(struct drm_device *dev, 


static int amdgpu_dm_connector_get_modes(struct drm_connector *connector);



static int amdgpu_dm_atomic_setup_commit(struct drm_atomic_state *state);

static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state);



static int amdgpu_dm_atomic_check(struct drm_device *dev,
@@ -3636,7 +3637,7 @@ static const struct drm_mode_config_funcs amdgpu_dm_mode_funcs = { 


static struct drm_mode_config_helper_funcs amdgpu_dm_mode_config_helperfuncs = {

	.atomic_commit_tail = amdgpu_dm_atomic_commit_tail,

	.atomic_commit_setup = drm_dp_mst_atomic_setup_commit,

	.atomic_commit_setup = amdgpu_dm_atomic_setup_commit,

};



static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector)
@@ -10362,6 +10363,39 @@ static void amdgpu_dm_update_hdcp(struct drm_atomic_state *state) 
	}

}



static int amdgpu_dm_atomic_setup_commit(struct drm_atomic_state *state)

{

	struct drm_crtc *crtc;

	struct drm_crtc_state *old_crtc_state, *new_crtc_state;

	struct dm_crtc_state *dm_old_crtc_state, *dm_new_crtc_state;

	int i, ret;



	ret = drm_dp_mst_atomic_setup_commit(state);

	if (ret)

		return ret;



	for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {

		dm_old_crtc_state = to_dm_crtc_state(old_crtc_state);

		dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);

		/*

		 * Color management settings. We also update color properties

		 * when a modeset is needed, to ensure it gets reprogrammed.

		 */

		if (dm_new_crtc_state->base.active && dm_new_crtc_state->stream &&

		    (dm_new_crtc_state->base.color_mgmt_changed ||

		     dm_old_crtc_state->regamma_tf != dm_new_crtc_state->regamma_tf ||

		     drm_atomic_crtc_needs_modeset(new_crtc_state))) {

			ret = amdgpu_dm_update_crtc_color_mgmt(dm_new_crtc_state);

			if (ret) {

				drm_dbg_atomic(state->dev, "Failed to update color state\n");

				return ret;

			}

		}

	}



	return 0;

}



/**

 * amdgpu_dm_atomic_commit_tail() - AMDgpu DM's commit tail implementation.

 * @state: The atomic state to commit