On Fri, 24 Jan 2025, Ville Syrjala <[email protected]> wrote:
> From: Ville Syrjälä <[email protected]>
>
> Pass the device argument as drm_device to intel_plane_fb_max_stride()
> to decouple i915_gem_dumb_create() vs. the display code a bit.
>
> xe currently doesn't even call this, but it probably should...
>
> Signed-off-by: Ville Syrjälä <[email protected]>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 6 ++++--
> drivers/gpu/drm/i915/display/intel_display.h | 2 +-
> drivers/gpu/drm/i915/display/intel_fb.c | 4 ++--
> drivers/gpu/drm/i915/gem/i915_gem_create.c | 2 +-
> 4 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index 7d68d652c1bc..157863428b52 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -713,13 +713,15 @@ void intel_add_fb_offsets(int *x, int *y,
> *y += state->view.color_plane[color_plane].y;
> }
>
> -u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv,
> +u32 intel_plane_fb_max_stride(struct drm_device *dev,
Purely subjective, but I've mostly been using struct drm_device *drm
where that's still needed.
BR,
Jani.
> u32 pixel_format, u64 modifier)
> {
> + struct intel_display *display = to_intel_display(dev);
> + struct drm_i915_private *dev_priv = to_i915(dev);
> struct intel_crtc *crtc;
> struct intel_plane *plane;
>
> - if (!HAS_DISPLAY(dev_priv))
> + if (!HAS_DISPLAY(display))
> return 0;
>
> /*
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h
> b/drivers/gpu/drm/i915/display/intel_display.h
> index 49a246feb1ae..b9ed0deb3f69 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -421,7 +421,7 @@ void intel_link_compute_m_n(u16 bpp, int nlanes,
> int pixel_clock, int link_clock,
> int bw_overhead,
> struct intel_link_m_n *m_n);
> -u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv,
> +u32 intel_plane_fb_max_stride(struct drm_device *dev,
> u32 pixel_format, u64 modifier);
> enum drm_mode_status
> intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv,
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.c
> b/drivers/gpu/drm/i915/display/intel_fb.c
> index 9f7f1b9f3275..3121371635bb 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> @@ -1847,7 +1847,7 @@ u32 intel_fb_max_stride(struct drm_i915_private
> *dev_priv,
> */
> if (DISPLAY_VER(dev_priv) < 4 || intel_fb_is_ccs_modifier(modifier) ||
> intel_fb_modifier_uses_dpt(dev_priv, modifier))
> - return intel_plane_fb_max_stride(dev_priv, pixel_format,
> modifier);
> + return intel_plane_fb_max_stride(&dev_priv->drm, pixel_format,
> modifier);
> else if (DISPLAY_VER(dev_priv) >= 7)
> return 256 * 1024;
> else
> @@ -1861,7 +1861,7 @@ intel_fb_stride_alignment(const struct drm_framebuffer
> *fb, int color_plane)
> unsigned int tile_width;
>
> if (is_surface_linear(fb, color_plane)) {
> - unsigned int max_stride = intel_plane_fb_max_stride(dev_priv,
> + unsigned int max_stride =
> intel_plane_fb_max_stride(&dev_priv->drm,
>
> fb->format->format,
>
> fb->modifier);
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_create.c
> b/drivers/gpu/drm/i915/gem/i915_gem_create.c
> index 19156ba4b9ef..c3e6a325872d 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_create.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_create.c
> @@ -193,7 +193,7 @@ i915_gem_dumb_create(struct drm_file *file,
> args->pitch = ALIGN(args->width * cpp, 64);
>
> /* align stride to page size so that we can remap */
> - if (args->pitch > intel_plane_fb_max_stride(to_i915(dev), format,
> + if (args->pitch > intel_plane_fb_max_stride(dev, format,
> DRM_FORMAT_MOD_LINEAR))
> args->pitch = ALIGN(args->pitch, 4096);
--
Jani Nikula, Intel
