On Tue, 29 Oct 2024, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Rename some variables from the intel_foo to just foo, to match
> the more modern style used throughout the driver.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/skl_scaler.c | 33 +++++++++++------------
> drivers/gpu/drm/i915/display/skl_scaler.h | 2 +-
> 2 files changed, 17 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c
> index 7dbc99b02eaa..b6a4effee5de 100644
> --- a/drivers/gpu/drm/i915/display/skl_scaler.c
> +++ b/drivers/gpu/drm/i915/display/skl_scaler.c
> @@ -268,20 +268,19 @@ int skl_update_scaler_crtc(struct intel_crtc_state *crtc_state)
> int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
> struct intel_plane_state *plane_state)
> {
> - struct intel_plane *intel_plane =
> - to_intel_plane(plane_state->uapi.plane);
> - struct drm_i915_private *dev_priv = to_i915(intel_plane->base.dev);
> + struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
> + struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
> struct drm_framebuffer *fb = plane_state->hw.fb;
> bool force_detach = !fb || !plane_state->uapi.visible;
> bool need_scaler = false;
>
> /* Pre-gen11 and SDR planes always need a scaler for planar formats. */
> - if (!icl_is_hdr_plane(dev_priv, intel_plane->id) &&
> + if (!icl_is_hdr_plane(dev_priv, plane->id) &&
> fb && intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier))
> need_scaler = true;
>
> return skl_update_scaler(crtc_state, force_detach,
> - drm_plane_index(&intel_plane->base),
> + drm_plane_index(&plane->base),
> &plane_state->scaler_id,
> drm_rect_width(&plane_state->uapi.src) >> 16,
> drm_rect_height(&plane_state->uapi.src) >> 16,
> @@ -293,18 +292,18 @@ int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
> }
>
> static int intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_state,
> - int num_scalers_need, struct intel_crtc *intel_crtc,
> + int num_scalers_need, struct intel_crtc *crtc,
> const char *name, int idx,
> struct intel_plane_state *plane_state,
> int *scaler_id)
> {
> - struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev);
> + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> int j;
> u32 mode;
>
> if (*scaler_id < 0) {
> /* find a free scaler */
> - for (j = 0; j < intel_crtc->num_scalers; j++) {
> + for (j = 0; j < crtc->num_scalers; j++) {
> if (scaler_state->scalers[j].in_use)
> continue;
>
> @@ -344,7 +343,7 @@ static int intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_stat
> }
> } else if (DISPLAY_VER(dev_priv) >= 10) {
> mode = PS_SCALER_MODE_NORMAL;
> - } else if (num_scalers_need == 1 && intel_crtc->num_scalers > 1) {
> + } else if (num_scalers_need == 1 && crtc->num_scalers > 1) {
> /*
> * when only 1 scaler is in use on a pipe with 2 scalers
> * scaler 0 operates in high quality (HQ) mode.
> @@ -419,7 +418,7 @@ static int intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_stat
> }
>
> drm_dbg_kms(&dev_priv->drm, "Attached scaler id %u.%u to %s:%d\n",
> - intel_crtc->pipe, *scaler_id, name, idx);
> + crtc->pipe, *scaler_id, name, idx);
> scaler_state->scalers[*scaler_id].mode = mode;
>
> return 0;
> @@ -428,7 +427,7 @@ static int intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_stat
> /**
> * intel_atomic_setup_scalers() - setup scalers for crtc per staged requests
> * @dev_priv: i915 device
> - * @intel_crtc: intel crtc
> + * @crtc: intel crtc
> * @crtc_state: incoming crtc_state to validate and setup scalers
> *
> * This function sets up scalers based on staged scaling requests for
> @@ -443,7 +442,7 @@ static int intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_stat
> * error code - otherwise
> */
> int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
> - struct intel_crtc *intel_crtc,
> + struct intel_crtc *crtc,
> struct intel_crtc_state *crtc_state)
> {
> struct drm_plane *plane = NULL;
> @@ -470,10 +469,10 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
> */
>
> /* fail if required scalers > available scalers */
> - if (num_scalers_need > intel_crtc->num_scalers) {
> + if (num_scalers_need > crtc->num_scalers) {
> drm_dbg_kms(&dev_priv->drm,
> "Too many scaling requests %d > %d\n",
> - num_scalers_need, intel_crtc->num_scalers);
> + num_scalers_need, crtc->num_scalers);
> return -EINVAL;
> }
>
> @@ -490,7 +489,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
>
> if (i == SKL_CRTC_INDEX) {
> name = "CRTC";
> - idx = intel_crtc->base.base.id;
> + idx = crtc->base.base.id;
>
> /* panel fitter case: assign as a crtc scaler */
> scaler_id = &scaler_state->scaler_id;
> @@ -531,7 +530,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
>
> /* plane on different crtc cannot be a scaler user of this crtc */
> if (drm_WARN_ON(&dev_priv->drm,
> - intel_plane->pipe != intel_crtc->pipe))
> + intel_plane->pipe != crtc->pipe))
> continue;
>
> plane_state = intel_atomic_get_new_plane_state(intel_state,
> @@ -540,7 +539,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
> }
>
> ret = intel_atomic_setup_scaler(scaler_state, num_scalers_need,
> - intel_crtc, name, idx,
> + crtc, name, idx,
> plane_state, scaler_id);
> if (ret < 0)
> return ret;
> diff --git a/drivers/gpu/drm/i915/display/skl_scaler.h b/drivers/gpu/drm/i915/display/skl_scaler.h
> index 63f93ca03c89..7a9ccdfd1cbb 100644
> --- a/drivers/gpu/drm/i915/display/skl_scaler.h
> +++ b/drivers/gpu/drm/i915/display/skl_scaler.h
> @@ -21,7 +21,7 @@ int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
> struct intel_plane_state *plane_state);
>
> int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
> - struct intel_crtc *intel_crtc,
> + struct intel_crtc *crtc,
> struct intel_crtc_state *crtc_state);
>
> void skl_pfit_enable(const struct intel_crtc_state *crtc_state);
--
Jani Nikula, Intel
