[Intel-gfx] [PATCH 10/23] drm/i915/intel_fb: Pull FB plane functions from intel_sprite.c

[Ville Syrjälä]

On Thu, Mar 11, 2021 at 12:17:23AM +0200, Imre Deak wrote:
> Move the FB plane specific function from intel_sprite.c to intel_fb.c
> 
> Signed-off-by: Imre Deak <imre.deak at intel.com>

Only used by intel_plane_compute_gtt() so makese sense.

Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_fb.c     | 32 +++++++++++++++++++++
>  drivers/gpu/drm/i915/display/intel_fb.h     |  4 +++
>  drivers/gpu/drm/i915/display/intel_sprite.c | 32 ---------------------
>  drivers/gpu/drm/i915/display/intel_sprite.h |  1 -
>  4 files changed, 36 insertions(+), 33 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
> index 74157d5f2d7f..8ebcded6a472 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> @@ -64,3 +64,35 @@ int skl_main_to_aux_plane(const struct drm_framebuffer *fb, int main_plane)
>  	else
>  		return 0;
>  }
> +
> +int intel_plane_check_stride(const struct intel_plane_state *plane_state)
> +{
> +	struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
> +	const struct drm_framebuffer *fb = plane_state->hw.fb;
> +	unsigned int rotation = plane_state->hw.rotation;
> +	u32 stride, max_stride;
> +
> +	/*
> +	 * We ignore stride for all invisible planes that
> +	 * can be remapped. Otherwise we could end up
> +	 * with a false positive when the remapping didn't
> +	 * kick in due the plane being invisible.
> +	 */
> +	if (intel_plane_can_remap(plane_state) &&
> +	    !plane_state->uapi.visible)
> +		return 0;
> +
> +	/* FIXME other color planes? */
> +	stride = plane_state->color_plane[0].stride;
> +	max_stride = plane->max_stride(plane, fb->format->format,
> +				       fb->modifier, rotation);
> +
> +	if (stride > max_stride) {
> +		DRM_DEBUG_KMS("[FB:%d] stride (%d) exceeds [PLANE:%d:%s] max stride (%d)\n",
> +			      fb->base.id, stride,
> +			      plane->base.base.id, plane->base.name, max_stride);
> +		return -EINVAL;
> +	}
> +
> +	return 0;
> +}
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
> index 6ea220438f9a..8c15f4c9561b 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.h
> +++ b/drivers/gpu/drm/i915/display/intel_fb.h
> @@ -10,6 +10,8 @@
>  
>  struct drm_framebuffer;
>  
> +struct intel_plane_state;
> +
>  bool is_ccs_plane(const struct drm_framebuffer *fb, int plane);
>  bool is_gen12_ccs_plane(const struct drm_framebuffer *fb, int plane);
>  bool is_gen12_ccs_cc_plane(const struct drm_framebuffer *fb, int plane);
> @@ -20,4 +22,6 @@ int main_to_ccs_plane(const struct drm_framebuffer *fb, int main_plane);
>  int skl_ccs_to_main_plane(const struct drm_framebuffer *fb, int ccs_plane);
>  int skl_main_to_aux_plane(const struct drm_framebuffer *fb, int main_plane);
>  
> +int intel_plane_check_stride(const struct intel_plane_state *plane_state);
> +
>  #endif /* __INTEL_FB_H__ */
> diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
> index 4cbdb8fd4bb1..0815f10b2246 100644
> --- a/drivers/gpu/drm/i915/display/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/display/intel_sprite.c
> @@ -49,38 +49,6 @@
>  #include "i9xx_plane.h"
>  #include "intel_vrr.h"
>  
> -int intel_plane_check_stride(const struct intel_plane_state *plane_state)
> -{
> -	struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
> -	const struct drm_framebuffer *fb = plane_state->hw.fb;
> -	unsigned int rotation = plane_state->hw.rotation;
> -	u32 stride, max_stride;
> -
> -	/*
> -	 * We ignore stride for all invisible planes that
> -	 * can be remapped. Otherwise we could end up
> -	 * with a false positive when the remapping didn't
> -	 * kick in due the plane being invisible.
> -	 */
> -	if (intel_plane_can_remap(plane_state) &&
> -	    !plane_state->uapi.visible)
> -		return 0;
> -
> -	/* FIXME other color planes? */
> -	stride = plane_state->color_plane[0].stride;
> -	max_stride = plane->max_stride(plane, fb->format->format,
> -				       fb->modifier, rotation);
> -
> -	if (stride > max_stride) {
> -		DRM_DEBUG_KMS("[FB:%d] stride (%d) exceeds [PLANE:%d:%s] max stride (%d)\n",
> -			      fb->base.id, stride,
> -			      plane->base.base.id, plane->base.name, max_stride);
> -		return -EINVAL;
> -	}
> -
> -	return 0;
> -}
> -
>  int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)
>  {
>  	const struct drm_framebuffer *fb = plane_state->hw.fb;
> diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h b/drivers/gpu/drm/i915/display/intel_sprite.h
> index f6989da2dc4b..c085eb87705c 100644
> --- a/drivers/gpu/drm/i915/display/intel_sprite.h
> +++ b/drivers/gpu/drm/i915/display/intel_sprite.h
> @@ -35,7 +35,6 @@ int intel_sprite_set_colorkey_ioctl(struct drm_device *dev, void *data,
>  				    struct drm_file *file_priv);
>  void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state);
>  void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state);
> -int intel_plane_check_stride(const struct intel_plane_state *plane_state);
>  int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state);
>  int chv_plane_check_rotation(const struct intel_plane_state *plane_state);
>  
> -- 
> 2.25.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel