| Message ID | 20240705145254.3355-4-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/{i915, xe}: FBC cleanups + tweak fbdev stolen usage | expand |
On Fri, Jul 05, 2024 at 05:52:37PM +0300, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > _intel_fbc_cfb_stride() calculates the CFB stride the hardware would > automagically generate from the plane's stride. Rename the function > to intel_fbc_plane_cfb_stride() to better reflect its purpose. > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_fbc.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c > index de8caa69a0dd..8f3b8f2cbf7b 100644 > --- a/drivers/gpu/drm/i915/display/intel_fbc.c > +++ b/drivers/gpu/drm/i915/display/intel_fbc.c > @@ -141,7 +141,7 @@ static unsigned int intel_fbc_plane_stride(const struct intel_plane_state *plane > } > > /* plane stride based cfb stride in bytes, assuming 1:1 compression limit */ > -static unsigned int _intel_fbc_cfb_stride(const struct intel_plane_state *plane_state) > +static unsigned int intel_fbc_plane_cfb_stride(const struct intel_plane_state *plane_state) > { > unsigned int cpp = 4; /* FBC always 4 bytes per pixel */ > > @@ -182,7 +182,7 @@ static unsigned int skl_fbc_min_cfb_stride(const struct intel_plane_state *plane > static unsigned int intel_fbc_cfb_stride(const struct intel_plane_state *plane_state) > { > struct intel_display *display = to_intel_display(plane_state->uapi.plane->dev); > - unsigned int stride = _intel_fbc_cfb_stride(plane_state); > + unsigned int stride = intel_fbc_plane_cfb_stride(plane_state); > > /* > * At least some of the platforms require each 4 line segment to > @@ -212,7 +212,7 @@ static u16 intel_fbc_override_cfb_stride(const struct intel_plane_state *plane_s > { > struct intel_display *display = to_intel_display(plane_state->uapi.plane->dev); > unsigned int stride_aligned = intel_fbc_cfb_stride(plane_state); > - unsigned int stride = _intel_fbc_cfb_stride(plane_state); > + unsigned int stride = intel_fbc_plane_cfb_stride(plane_state); > const struct drm_framebuffer *fb = plane_state->hw.fb; > > /* > -- > 2.44.2 >
diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c index de8caa69a0dd..8f3b8f2cbf7b 100644 --- a/drivers/gpu/drm/i915/display/intel_fbc.c +++ b/drivers/gpu/drm/i915/display/intel_fbc.c @@ -141,7 +141,7 @@ static unsigned int intel_fbc_plane_stride(const struct intel_plane_state *plane } /* plane stride based cfb stride in bytes, assuming 1:1 compression limit */ -static unsigned int _intel_fbc_cfb_stride(const struct intel_plane_state *plane_state) +static unsigned int intel_fbc_plane_cfb_stride(const struct intel_plane_state *plane_state) { unsigned int cpp = 4; /* FBC always 4 bytes per pixel */ @@ -182,7 +182,7 @@ static unsigned int skl_fbc_min_cfb_stride(const struct intel_plane_state *plane static unsigned int intel_fbc_cfb_stride(const struct intel_plane_state *plane_state) { struct intel_display *display = to_intel_display(plane_state->uapi.plane->dev); - unsigned int stride = _intel_fbc_cfb_stride(plane_state); + unsigned int stride = intel_fbc_plane_cfb_stride(plane_state); /* * At least some of the platforms require each 4 line segment to @@ -212,7 +212,7 @@ static u16 intel_fbc_override_cfb_stride(const struct intel_plane_state *plane_s { struct intel_display *display = to_intel_display(plane_state->uapi.plane->dev); unsigned int stride_aligned = intel_fbc_cfb_stride(plane_state); - unsigned int stride = _intel_fbc_cfb_stride(plane_state); + unsigned int stride = intel_fbc_plane_cfb_stride(plane_state); const struct drm_framebuffer *fb = plane_state->hw.fb; /*