Commit 214993e1 authored by Mikita Lipski's avatar Mikita Lipski Committed by Alex Deucher
Browse files

drm/amd/display: introduce mpo detection flags 



[why]
We want to know if new crtc state is enabling MPO configuration before
enabling it.
[how]
Detect if both primary and overlay planes are enabled on the same CRTC.

Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarMikita Lipski <mikita.lipski@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 46a74381

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

+9 −1
Original line number Diff line number Diff line
@@ -10761,6 +10761,8 @@ static int dm_update_plane_state(struct dc *dc, 


		dm_new_plane_state->dc_state = dc_new_plane_state;



		dm_new_crtc_state->mpo_requested |= (plane->type == DRM_PLANE_TYPE_OVERLAY);



		/* Tell DC to do a full surface update every time there

		 * is a plane change. Inefficient, but works for now.

		 */
@@ -10913,7 +10915,7 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, 
	enum dc_status status;

	int ret, i;

	bool lock_and_validation_needed = false;

	struct dm_crtc_state *dm_old_crtc_state;

	struct dm_crtc_state *dm_old_crtc_state, *dm_new_crtc_state;

#if defined(CONFIG_DRM_AMD_DC_DCN)

	struct dsc_mst_fairness_vars vars[MAX_PIPES];

	struct drm_dp_mst_topology_state *mst_state;
@@ -11095,6 +11097,12 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, 
		goto fail;

	}



	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {

		dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);

		if (dm_new_crtc_state->mpo_requested)

			DRM_DEBUG_DRIVER("MPO enablement requested on crtc:[%p]\n", crtc);

	}



	/* Check cursor planes scaling */

	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {

		ret = dm_check_crtc_cursor(state, crtc, new_crtc_state);

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

+2 −0
Original line number Diff line number Diff line
@@ -626,6 +626,8 @@ struct dm_crtc_state { 
	bool cm_has_degamma;

	bool cm_is_degamma_srgb;



	bool mpo_requested;



	int update_type;

	int active_planes;