summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Grzelak <michal.grzelak@intel.com>2026-05-09 19:40:44 +0300
committerVille Syrjälä <ville.syrjala@linux.intel.com>2026-05-21 02:54:28 +0300
commit20101fc2db2b244b90bf58eb723b487325b81799 (patch)
tree137598dc5ffefe558a18f75369bdc71e244f2bec
parent86049a7163ed64fa16f1342bbc6b10e45971b11d (diff)
downloadlinux-20101fc2db2b244b90bf58eb723b487325b81799.tar.xz
drm/i915/scaler: s/i/scaler_id/ where appropriate
Switch from generic iterator naming into more specific scaler_id where it is possible. Cc: Nemesa Garg <nemesa.garg@intel.com> Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Michał Grzelak <michal.grzelak@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patch.msgid.link/20260509164048.627399-6-michal.grzelak@intel.com
-rw-r--r--drivers/gpu/drm/i915/display/skl_scaler.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c
index eceda1a909cc..d15e0194ca10 100644
--- a/drivers/gpu/drm/i915/display/skl_scaler.c
+++ b/drivers/gpu/drm/i915/display/skl_scaler.c
@@ -950,26 +950,26 @@ void skl_scaler_get_config(struct intel_crtc_state *crtc_state)
struct intel_display *display = to_intel_display(crtc_state);
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state;
+ int scaler_id;
int id = -1;
- int i;
/* find scaler attached to this pipe */
- for (i = 0; i < crtc->num_scalers; i++) {
+ for (scaler_id = 0; scaler_id < crtc->num_scalers; scaler_id++) {
u32 ctl, pos, size;
- ctl = intel_de_read(display, SKL_PS_CTRL(crtc->pipe, i));
+ ctl = intel_de_read(display, SKL_PS_CTRL(crtc->pipe, scaler_id));
if ((ctl & (PS_SCALER_EN | PS_BINDING_MASK)) != (PS_SCALER_EN | PS_BINDING_PIPE))
continue;
- id = i;
+ id = scaler_id;
- if (scaler_has_casf(display, i))
+ if (scaler_has_casf(display, scaler_id))
intel_casf_sharpness_get_config(crtc_state);
crtc_state->pch_pfit.enabled = true;
- pos = intel_de_read(display, SKL_PS_WIN_POS(crtc->pipe, i));
- size = intel_de_read(display, SKL_PS_WIN_SZ(crtc->pipe, i));
+ pos = intel_de_read(display, SKL_PS_WIN_POS(crtc->pipe, scaler_id));
+ size = intel_de_read(display, SKL_PS_WIN_SZ(crtc->pipe, scaler_id));
drm_rect_init(&crtc_state->pch_pfit.dst,
REG_FIELD_GET(PS_WIN_XPOS_MASK, pos),
@@ -977,7 +977,7 @@ void skl_scaler_get_config(struct intel_crtc_state *crtc_state)
REG_FIELD_GET(PS_WIN_XSIZE_MASK, size),
REG_FIELD_GET(PS_WIN_YSIZE_MASK, size));
- scaler_state->scalers[i].in_use = true;
+ scaler_state->scalers[scaler_id].in_use = true;
break;
}