[PATCH v2 06/10] drm/i915: Remove pointless visible check in unlink_nv12_plane()

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala at linux.intel.com>

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 at linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 5ce450550ba8..cccf5d39b34a 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -4413,19 +4413,23 @@ 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) {
-		crtc_state->enabled_planes &= ~BIT(plane->id);
-		crtc_state->active_planes &= ~BIT(plane->id);
-		crtc_state->update_planes |= BIT(plane->id);
-		crtc_state->data_rate[plane->id] = 0;
-		crtc_state->rel_data_rate[plane->id] = 0;
-	}
+	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);
+	crtc_state->data_rate[plane->id] = 0;
+	crtc_state->rel_data_rate[plane->id] = 0;
 }
 
 static int icl_check_nv12_planes(struct intel_atomic_state *state,
-- 
2.45.3