Commit 6a01df2f authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Remove pointless visible check in unlink_nv12_plane() 



visible can't be true when is_y_plane is true. Replace the
bogus check with an WARN_ON(). Flatten the function while
at it.

Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250212164330.16891-7-ville.syrjala@linux.intel.com
parent a33a6b2f

drivers/gpu/drm/i915/display/intel_display.c

+11 −7
Original line number Diff line number Diff line
@@ -4408,11 +4408,18 @@ static bool check_single_encoder_cloning(struct intel_atomic_state *state, 
static void unlink_nv12_plane(struct intel_crtc_state *crtc_state,

			      struct intel_plane_state *plane_state)

{

	struct intel_display *display = to_intel_display(plane_state);

	struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);



	plane_state->planar_linked_plane = NULL;



	if (plane_state->is_y_plane && !plane_state->uapi.visible) {

	if (!plane_state->is_y_plane)

		return;



	drm_WARN_ON(display->drm, plane_state->uapi.visible);



	plane_state->is_y_plane = false;



	crtc_state->enabled_planes &= ~BIT(plane->id);

	crtc_state->active_planes &= ~BIT(plane->id);

	crtc_state->update_planes |= BIT(plane->id);
@@ -4420,9 +4427,6 @@ static void unlink_nv12_plane(struct intel_crtc_state *crtc_state, 
	crtc_state->rel_data_rate[plane->id] = 0;

}



	plane_state->is_y_plane = false;

}



static int icl_check_nv12_planes(struct intel_atomic_state *state,

				 struct intel_crtc *crtc)

{