On Mon, May 13, 2024 at 08:59:38PM +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Split intel_cursor_alignment() into per-platform variants.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Imre Deak <imre.deak@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_cursor.c | 40 +++++++++++++++++++--
> drivers/gpu/drm/i915/display/intel_fb.c | 16 ---------
> drivers/gpu/drm/i915/display/intel_fb.h | 3 --
> 3 files changed, 38 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
> index 026975f569a7..737d53c50901 100644
> --- a/drivers/gpu/drm/i915/display/intel_cursor.c
> +++ b/drivers/gpu/drm/i915/display/intel_cursor.c
> @@ -193,6 +193,13 @@ i845_cursor_max_stride(struct intel_plane *plane,
> return 2048;
> }
>
> +static unsigned int i845_cursor_min_alignment(struct intel_plane *plane,
> + const struct drm_framebuffer *fb,
> + int color_plane)
> +{
> + return 32;
> +}
> +
> static u32 i845_cursor_ctl_crtc(const struct intel_crtc_state *crtc_state)
> {
> u32 cntl = 0;
> @@ -343,6 +350,28 @@ i9xx_cursor_max_stride(struct intel_plane *plane,
> return plane->base.dev->mode_config.cursor_width * 4;
> }
>
> +static unsigned int i830_cursor_min_alignment(struct intel_plane *plane,
> + const struct drm_framebuffer *fb,
> + int color_plane)
> +{
> + /* "AlmadorM Errata – Requires 32-bpp cursor data to be 16KB aligned." */
> + return 16 * 1024; /* physical */
> +}
> +
> +static unsigned int i85x_cursor_min_alignment(struct intel_plane *plane,
> + const struct drm_framebuffer *fb,
> + int color_plane)
> +{
> + return 256; /* physical */
> +}
> +
> +static unsigned int i9xx_cursor_min_alignment(struct intel_plane *plane,
> + const struct drm_framebuffer *fb,
> + int color_plane)
> +{
> + return 4 * 1024; /* physical for i915/i945 */
> +}
> +
> static u32 i9xx_cursor_ctl_crtc(const struct intel_crtc_state *crtc_state)
> {
> struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> @@ -884,20 +913,27 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv,
>
> if (IS_I845G(dev_priv) || IS_I865G(dev_priv)) {
> cursor->max_stride = i845_cursor_max_stride;
> + cursor->min_alignment = i845_cursor_min_alignment;
> cursor->update_arm = i845_cursor_update_arm;
> cursor->disable_arm = i845_cursor_disable_arm;
> cursor->get_hw_state = i845_cursor_get_hw_state;
> cursor->check_plane = i845_check_cursor;
> } else {
> cursor->max_stride = i9xx_cursor_max_stride;
> +
> + if (IS_I830(dev_priv))
> + cursor->min_alignment = i830_cursor_min_alignment;
> + else if (IS_I85X(dev_priv))
> + cursor->min_alignment = i85x_cursor_min_alignment;
> + else
> + cursor->min_alignment = i9xx_cursor_min_alignment;
> +
> cursor->update_arm = i9xx_cursor_update_arm;
> cursor->disable_arm = i9xx_cursor_disable_arm;
> cursor->get_hw_state = i9xx_cursor_get_hw_state;
> cursor->check_plane = i9xx_check_cursor;
> }
>
> - cursor->min_alignment = intel_cursor_alignment;
> -
> cursor->cursor.base = ~0;
> cursor->cursor.cntl = ~0;
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
> index c5bae05cbbc3..c84ecae3a57c 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> @@ -776,22 +776,6 @@ bool intel_fb_uses_dpt(const struct drm_framebuffer *fb)
> intel_fb_modifier_uses_dpt(to_i915(fb->dev), fb->modifier);
> }
>
> -unsigned int intel_cursor_alignment(struct intel_plane *plane,
> - const struct drm_framebuffer *fb,
> - int color_plane)
> -{
> - struct drm_i915_private *i915 = to_i915(plane->base.dev);
> -
> - if (IS_I830(i915))
> - return 16 * 1024;
> - else if (IS_I85X(i915))
> - return 256;
> - else if (IS_I845G(i915) || IS_I865G(i915))
> - return 32;
> - else
> - return 4 * 1024;
> -}
> -
> static unsigned int intel_linear_alignment(const struct drm_i915_private *dev_priv)
> {
> if (DISPLAY_VER(dev_priv) >= 9)
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
> index 86c01a3ce81e..16ebb573643f 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.h
> +++ b/drivers/gpu/drm/i915/display/intel_fb.h
> @@ -60,9 +60,6 @@ unsigned int intel_tile_height(const struct drm_framebuffer *fb, int color_plane
> unsigned int intel_tile_row_size(const struct drm_framebuffer *fb, int color_plane);
> unsigned int intel_fb_align_height(const struct drm_framebuffer *fb,
> int color_plane, unsigned int height);
> -unsigned int intel_cursor_alignment(struct intel_plane *plane,
> - const struct drm_framebuffer *fb,
> - int color_plane);
> unsigned int intel_surf_alignment(struct intel_plane *plane,
> const struct drm_framebuffer *fb,
> int color_plane);
> --
> 2.43.2
>
