On Mon, 15 Jun 2026, Michał Grzelak <[email protected]> wrote: > intel_allocate_scaler() no longer uses plane_state since condition > containing it has been removed while adding scaler_has_casf(). Remove > plane_state as well. > > Cc: Nemesa Garg <[email protected]> > Cc: Ville Syrjälä <[email protected]> > Fixes: 17d70a0760f2 ("drm/i915/casf: Extract scaler_has_casf()")
The Fixes: trailer basically means there's an actual bug in that commit that needs fixing, and the fix needs to go where that commit goes, including stable backports, etc. This is not the case here. This is an improvement, but there's no bug that gets fixed. (The trailer can be removed while applying.) Reviewed-by: Jani Nikula <[email protected]> > Signed-off-by: Michał Grzelak <[email protected]> > --- > drivers/gpu/drm/i915/display/skl_scaler.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c > b/drivers/gpu/drm/i915/display/skl_scaler.c > index 7994b983d509d..4b456924fdef3 100644 > --- a/drivers/gpu/drm/i915/display/skl_scaler.c > +++ b/drivers/gpu/drm/i915/display/skl_scaler.c > @@ -334,7 +334,6 @@ static bool scaler_has_casf(struct intel_display > *display, int scaler_id) > > static int intel_allocate_scaler(struct intel_crtc_scaler_state > *scaler_state, > struct intel_crtc *crtc, > - struct intel_plane_state *plane_state, > bool casf_scaler) > { > struct intel_display *display = to_intel_display(crtc); > @@ -406,7 +405,7 @@ static int intel_atomic_setup_scaler(struct > intel_crtc_state *crtc_state, > int vscale = 0; > > if (*scaler_id < 0) > - *scaler_id = intel_allocate_scaler(scaler_state, crtc, > plane_state, casf_scaler); > + *scaler_id = intel_allocate_scaler(scaler_state, crtc, > casf_scaler); > > if (drm_WARN(display->drm, *scaler_id < 0, > "Cannot find scaler for %s:%d\n", name, idx)) -- Jani Nikula, Intel
