drm/i915: Plumb the full atomic state into icl_check_nv12_planes()

icl_check_nv12_planes() needs the full atomic state. Instead of
digging that out from dubious sources plumb it in explicitly.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240528184945.24083-2-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 765a7ab04a1ca78ec4700bf349b9989f1a8d4505..7370acdd6b8bcc10c08741cd814ec27b18194e6f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -4034,11 +4034,12 @@ static int icl_add_linked_planes(struct intel_atomic_state *state)
        return 0;
 }
 
-static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)
+static int icl_check_nv12_planes(struct intel_atomic_state *state,
+                                struct intel_crtc *crtc)
 {
-       struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
-       struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-       struct intel_atomic_state *state = to_intel_atomic_state(crtc_state->uapi.state);
+       struct drm_i915_private *dev_priv = to_i915(state->base.dev);
+       struct intel_crtc_state *crtc_state =
+               intel_atomic_get_new_crtc_state(state, crtc);
        struct intel_plane *plane, *linked;
        struct intel_plane_state *plane_state;
        int i;
@@ -5819,7 +5820,7 @@ static int intel_atomic_check_planes(struct intel_atomic_state *state)
                                            new_crtc_state, i) {
                u8 old_active_planes, new_active_planes;
 
-               ret = icl_check_nv12_planes(new_crtc_state);
+               ret = icl_check_nv12_planes(state, crtc);
                if (ret)
                        return ret;