Skip to content

Commit 6a01df2

Browse files
committed
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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20250212164330.16891-7-ville.syrjala@linux.intel.com
1 parent a33a6b2 commit 6a01df2

1 file changed

Lines changed: 11 additions & 7 deletions

File tree

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4408,19 +4408,23 @@ static bool check_single_encoder_cloning(struct intel_atomic_state *state,
44084408
static void unlink_nv12_plane(struct intel_crtc_state *crtc_state,
44094409
struct intel_plane_state *plane_state)
44104410
{
4411+
struct intel_display *display = to_intel_display(plane_state);
44114412
struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
44124413

44134414
plane_state->planar_linked_plane = NULL;
44144415

4415-
if (plane_state->is_y_plane && !plane_state->uapi.visible) {
4416-
crtc_state->enabled_planes &= ~BIT(plane->id);
4417-
crtc_state->active_planes &= ~BIT(plane->id);
4418-
crtc_state->update_planes |= BIT(plane->id);
4419-
crtc_state->data_rate[plane->id] = 0;
4420-
crtc_state->rel_data_rate[plane->id] = 0;
4421-
}
4416+
if (!plane_state->is_y_plane)
4417+
return;
4418+
4419+
drm_WARN_ON(display->drm, plane_state->uapi.visible);
44224420

44234421
plane_state->is_y_plane = false;
4422+
4423+
crtc_state->enabled_planes &= ~BIT(plane->id);
4424+
crtc_state->active_planes &= ~BIT(plane->id);
4425+
crtc_state->update_planes |= BIT(plane->id);
4426+
crtc_state->data_rate[plane->id] = 0;
4427+
crtc_state->rel_data_rate[plane->id] = 0;
44244428
}
44254429

44264430
static int icl_check_nv12_planes(struct intel_atomic_state *state,

0 commit comments

Comments
 (0)