]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/i915/scaler: Use crtc_state to setup plane or pipe scaler
authorMitul Golani <mitulkumar.ajitkumar.golani@intel.com>
Mon, 20 Jan 2025 17:22:03 +0000 (22:52 +0530)
committerAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Fri, 24 Jan 2025 02:20:32 +0000 (07:50 +0530)
Pass crtc_state to intel_atomic_setup_scaler, this will help to
check if pch_pfit enabled or not and also will be useful to pass
scaler_state with the same which will be used later to store
hscale and vscale values.

-- v2:
- Fix typos. (Ankit)

Signed-off-by: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com>
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250120172209.188488-3-mitulkumar.ajitkumar.golani@intel.com
drivers/gpu/drm/i915/display/skl_scaler.c

index b960cba31043cccdeb5ff092fde5734dbc15e28b..24514cb3c60599d284f217161b0791b38e78ea76 100644 (file)
@@ -319,13 +319,15 @@ static int intel_allocate_scaler(struct intel_crtc_scaler_state *scaler_state,
        return -1;
 }
 
-static int intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_state,
+static int intel_atomic_setup_scaler(struct intel_crtc_state *crtc_state,
                                     int num_scalers_need, struct intel_crtc *crtc,
                                     const char *name, int idx,
                                     struct intel_plane_state *plane_state,
                                     int *scaler_id)
 {
        struct intel_display *display = to_intel_display(crtc);
+       struct intel_crtc_scaler_state *scaler_state =
+                                       &crtc_state->scaler_state;
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        u32 mode;
 
@@ -455,7 +457,7 @@ static int setup_crtc_scaler(struct intel_atomic_state *state,
        struct intel_crtc_scaler_state *scaler_state =
                &crtc_state->scaler_state;
 
-       return intel_atomic_setup_scaler(scaler_state,
+       return intel_atomic_setup_scaler(crtc_state,
                                         hweight32(scaler_state->scaler_users),
                                         crtc, "CRTC", crtc->base.base.id,
                                         NULL, &scaler_state->scaler_id);
@@ -490,7 +492,7 @@ static int setup_plane_scaler(struct intel_atomic_state *state,
        if (IS_ERR(plane_state))
                return PTR_ERR(plane_state);
 
-       return intel_atomic_setup_scaler(scaler_state,
+       return intel_atomic_setup_scaler(crtc_state,
                                         hweight32(scaler_state->scaler_users),
                                         crtc, "PLANE", plane->base.base.id,
                                         plane_state, &plane_state->scaler_id);