[PATCH v2 05/10] drm/i915: Extract unlink_nv12_plane()

[Ville Syrjala]

From: Ville Syrjälä <ville.syrj...@linux.intel.com>

Pull the details of the nv12 plane unlinking to a small
function to make the higher level code less messy.

Reviewed-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 32 +++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index df477a00a315..5ce450550ba8 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -4410,6 +4410,24 @@ static bool check_single_encoder_cloning(struct 
intel_atomic_state *state,
        return true;
 }
 
+static void unlink_nv12_plane(struct intel_crtc_state *crtc_state,
+                             struct intel_plane_state *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;
+       }
+
+       plane_state->is_y_plane = false;
+}
+
 static int icl_check_nv12_planes(struct intel_atomic_state *state,
                                 struct intel_crtc *crtc)
 {
@@ -4429,19 +4447,11 @@ static int icl_check_nv12_planes(struct 
intel_atomic_state *state,
         * in the crtc_state->active_planes mask.
         */
        for_each_new_intel_plane_in_state(state, plane, plane_state, i) {
-               if (plane->pipe != crtc->pipe || 
!plane_state->planar_linked_plane)
+               if (plane->pipe != crtc->pipe)
                        continue;
 
-               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;
-               }
-
-               plane_state->is_y_plane = false;
+               if (plane_state->planar_linked_plane)
+                       unlink_nv12_plane(crtc_state, plane_state);
        }
 
        if (!crtc_state->nv12_planes)
-- 
2.45.3