Commit 95357b68 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Pass drm_format_info into plane->max_stride() 



Pass the format info into plane->max_stride() from the
caller instead of doing yet another drm_format_info()
lookup on the spot.

drm_format_info() is both rather expensive, and technically
incorrect since it doesn't return the correct format info
for compressed formats (though that doesn't actually matter
for the current .max_stride() implementations since they
are just interested in the cpp value).

Most callers already have the format info available. The
only exception is intel_dumb_fb_max_stride() where we shall
use the actually correct drm_get_format_info() variant.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20251107181126.5743-3-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 854efdc7

drivers/gpu/drm/i915/display/i9xx_plane.c

+10 −13
Original line number Diff line number Diff line
@@ -754,10 +754,9 @@ static bool i9xx_plane_get_hw_state(struct intel_plane *plane, 


static unsigned int

hsw_primary_max_stride(struct intel_plane *plane,

		       u32 pixel_format, u64 modifier,

		       unsigned int rotation)

		       const struct drm_format_info *info,

		       u64 modifier, unsigned int rotation)

{

	const struct drm_format_info *info = drm_format_info(pixel_format);

	int cpp = info->cpp[0];



	/* Limit to 8k pixels to guarantee OFFSET.x doesn't get too big. */
@@ -766,10 +765,9 @@ hsw_primary_max_stride(struct intel_plane *plane, 


static unsigned int

ilk_primary_max_stride(struct intel_plane *plane,

		       u32 pixel_format, u64 modifier,

		       unsigned int rotation)

		       const struct drm_format_info *info,

		       u64 modifier, unsigned int rotation)

{

	const struct drm_format_info *info = drm_format_info(pixel_format);

	int cpp = info->cpp[0];



	/* Limit to 4k pixels to guarantee TILEOFF.x doesn't get too big. */
@@ -781,10 +779,9 @@ ilk_primary_max_stride(struct intel_plane *plane, 


unsigned int

i965_plane_max_stride(struct intel_plane *plane,

		      u32 pixel_format, u64 modifier,

		      unsigned int rotation)

		      const struct drm_format_info *info,

		      u64 modifier, unsigned int rotation)

{

	const struct drm_format_info *info = drm_format_info(pixel_format);

	int cpp = info->cpp[0];



	/* Limit to 4k pixels to guarantee TILEOFF.x doesn't get too big. */
@@ -796,8 +793,8 @@ i965_plane_max_stride(struct intel_plane *plane, 


static unsigned int

i915_plane_max_stride(struct intel_plane *plane,

		      u32 pixel_format, u64 modifier,

		      unsigned int rotation)

		      const struct drm_format_info *info,

		      u64 modifier, unsigned int rotation)

{

	if (modifier == I915_FORMAT_MOD_X_TILED)

		return 8 * 1024;
@@ -807,8 +804,8 @@ i915_plane_max_stride(struct intel_plane *plane, 


static unsigned int

i8xx_plane_max_stride(struct intel_plane *plane,

		      u32 pixel_format, u64 modifier,

		      unsigned int rotation)

		      const struct drm_format_info *info,

		      u64 modifier, unsigned int rotation)

{

	if (plane->i9xx_plane == PLANE_C)

		return 4 * 1024;

drivers/gpu/drm/i915/display/i9xx_plane.h

+3 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/types.h>



enum pipe;

struct drm_format_info;

struct drm_framebuffer;

struct intel_crtc;

struct intel_display;
@@ -18,8 +19,8 @@ struct intel_plane_state; 


#ifdef I915

unsigned int i965_plane_max_stride(struct intel_plane *plane,

				   u32 pixel_format, u64 modifier,

				   unsigned int rotation);

				   const struct drm_format_info *info,

				   u64 modifier, unsigned int rotation);

unsigned int vlv_plane_min_alignment(struct intel_plane *plane,

				     const struct drm_framebuffer *fb,

				     int colot_plane);

drivers/gpu/drm/i915/display/intel_cursor.c

+4 −4
Original line number Diff line number Diff line
@@ -182,8 +182,8 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state, 


static unsigned int

i845_cursor_max_stride(struct intel_plane *plane,

		       u32 pixel_format, u64 modifier,

		       unsigned int rotation)

		       const struct drm_format_info *info,

		       u64 modifier, unsigned int rotation)

{

	return 2048;

}
@@ -343,8 +343,8 @@ static bool i845_cursor_get_hw_state(struct intel_plane *plane, 


static unsigned int

i9xx_cursor_max_stride(struct intel_plane *plane,

		       u32 pixel_format, u64 modifier,

		       unsigned int rotation)

		       const struct drm_format_info *info,

		       u64 modifier, unsigned int rotation)

{

	return plane->base.dev->mode_config.cursor_width * 4;

}

drivers/gpu/drm/i915/display/intel_display.c

+6 −3
Original line number Diff line number Diff line
@@ -548,7 +548,8 @@ void intel_disable_transcoder(const struct intel_crtc_state *old_crtc_state) 
}



u32 intel_plane_fb_max_stride(struct intel_display *display,

			      u32 pixel_format, u64 modifier)

			      const struct drm_format_info *info,

			      u64 modifier)

{

	struct intel_crtc *crtc;

	struct intel_plane *plane;
@@ -564,7 +565,7 @@ u32 intel_plane_fb_max_stride(struct intel_display *display, 


	plane = to_intel_plane(crtc->base.primary);



	return plane->max_stride(plane, pixel_format, modifier,

	return plane->max_stride(plane, info, modifier,

				 DRM_MODE_ROTATE_0);

}
@@ -576,7 +577,9 @@ u32 intel_dumb_fb_max_stride(struct drm_device *drm, 
	if (!HAS_DISPLAY(display))

		return 0;



	return intel_plane_fb_max_stride(display, pixel_format, modifier);

	return intel_plane_fb_max_stride(display,

					 drm_get_format_info(drm, pixel_format, modifier),

					 modifier);

}



void intel_set_plane_visible(struct intel_crtc_state *crtc_state,

drivers/gpu/drm/i915/display/intel_display.h

+3 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ struct drm_atomic_state; 
struct drm_device;

struct drm_display_mode;

struct drm_encoder;

struct drm_format_info;

struct drm_modeset_acquire_ctx;

struct intel_atomic_state;

struct intel_crtc;
@@ -403,7 +404,8 @@ void intel_link_compute_m_n(u16 bpp, int nlanes, 
			    int bw_overhead,

			    struct intel_link_m_n *m_n);

u32 intel_plane_fb_max_stride(struct intel_display *display,

			      u32 pixel_format, u64 modifier);

			      const struct drm_format_info *info,

			      u64 modifier);

u32 intel_dumb_fb_max_stride(struct drm_device *drm,

			     u32 pixel_format, u64 modifier);

enum drm_mode_status