Commit 2afda735 authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

drm/amdgpu/dc: Simplify drm_crtc_state::active checks 



drm_atomic_crtc_check enforces that ::active can only be true if
::enable is as well.

Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: default avatarMichel Dänzer <mdaenzer@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8fe384ff

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

+3 −13
Original line number Diff line number Diff line
@@ -3430,21 +3430,12 @@ static bool modeset_required(struct drm_crtc_state *crtc_state, 
			     struct dc_stream_state *new_stream,

			     struct dc_stream_state *old_stream)

{

	if (!drm_atomic_crtc_needs_modeset(crtc_state))

		return false;



	if (!crtc_state->enable)

		return false;



	return crtc_state->active;

	return crtc_state->active && drm_atomic_crtc_needs_modeset(crtc_state);

}



static bool modereset_required(struct drm_crtc_state *crtc_state)

{

	if (!drm_atomic_crtc_needs_modeset(crtc_state))

		return false;



	return !crtc_state->enable || !crtc_state->active;

	return !crtc_state->active && drm_atomic_crtc_needs_modeset(crtc_state);

}



static void amdgpu_dm_encoder_destroy(struct drm_encoder *encoder)
@@ -8034,8 +8025,7 @@ skip_modeset: 
	 * We want to do dc stream updates that do not require a

	 * full modeset below.

	 */

	if (!(enable && aconnector && new_crtc_state->enable &&

	      new_crtc_state->active))

	if (!(enable && aconnector && new_crtc_state->active))

		return 0;

	/*

	 * Given above conditions, the dc state cannot be NULL because:

CRA Git | Maintained and supported by SUSTech CRA and CCSE