> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Ville > Syrjala > Sent: Wednesday, November 24, 2021 1:37 PM > To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Subject: [PATCH 02/20] drm/i915/fbc: Pass whole plane state to > intel_fbc_min_limit() > > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > No reason to burden the caller with the details on how the minimum > compression limit is calculated, so just pass in the whole plane state instead of > just the cpp value. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Reviewed-by: Mika Kahola <mika.kahola@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_fbc.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c > b/drivers/gpu/drm/i915/display/intel_fbc.c > index d0c34bc3af6c..083c0cab4847 100644 > --- a/drivers/gpu/drm/i915/display/intel_fbc.c > +++ b/drivers/gpu/drm/i915/display/intel_fbc.c > @@ -679,8 +679,10 @@ static u64 intel_fbc_stolen_end(struct > drm_i915_private *i915) > return min(end, intel_fbc_cfb_base_max(i915)); } > > -static int intel_fbc_min_limit(int fb_cpp) > +static int intel_fbc_min_limit(const struct intel_plane_state > +*plane_state) > { > + int fb_cpp = plane_state->hw.fb ? plane_state->hw.fb->format->cpp[0] > : > +0; > + > return fb_cpp == 2 ? 2 : 1; > } > > @@ -1466,8 +1468,7 @@ static void intel_fbc_enable(struct intel_atomic_state > *state, > > cache = &fbc->state_cache; > > - min_limit = intel_fbc_min_limit(plane_state->hw.fb ? > - plane_state->hw.fb->format->cpp[0] : > 0); > + min_limit = intel_fbc_min_limit(plane_state); > > mutex_lock(&fbc->lock); > > -- > 2.32.0