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

drm/i915: Add .max_stride() plane hook 



Each plane may have different stride limitations. Let's add a new
plane function to retutn the maximum stride for each plane. There's
going to be some use for this outside the .atomic_check() stuff hence
the separate hook.

v2: Fix ilk+ x-tiled max stride to be 32k (José)

Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180907152413.15761-3-ville.syrjala@linux.intel.com
parent 6d19a44c

drivers/gpu/drm/i915/intel_display.c

+48 −0
Original line number Original line Diff line number Diff line
@@ -3213,6 +3213,33 @@ int skl_check_plane_surface(const struct intel_crtc_state *crtc_state, 
	return 0;

	return 0;

}

}





unsigned int

i9xx_plane_max_stride(struct intel_plane *plane,

		      u32 pixel_format, u64 modifier,

		      unsigned int rotation)

{

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);



	if (!HAS_GMCH_DISPLAY(dev_priv)) {

		return 32*1024;

	} else if (INTEL_GEN(dev_priv) >= 4) {

		if (modifier == I915_FORMAT_MOD_X_TILED)

			return 16*1024;

		else

			return 32*1024;

	} else if (INTEL_GEN(dev_priv) >= 3) {

		if (modifier == I915_FORMAT_MOD_X_TILED)

			return 8*1024;

		else

			return 16*1024;

	} else {

		if (plane->i9xx_plane == PLANE_C)

			return 4*1024;

		else

			return 8*1024;

	}

}



static u32 i9xx_plane_ctl(const struct intel_crtc_state *crtc_state,

static u32 i9xx_plane_ctl(const struct intel_crtc_state *crtc_state,

			  const struct intel_plane_state *plane_state)

			  const struct intel_plane_state *plane_state)

{

{
@@ -9681,6 +9708,14 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state, 
	return 0;

	return 0;

}

}





static unsigned int

i845_cursor_max_stride(struct intel_plane *plane,

		       u32 pixel_format, u64 modifier,

		       unsigned int rotation)

{

	return 2048;

}



static u32 i845_cursor_ctl(const struct intel_crtc_state *crtc_state,

static u32 i845_cursor_ctl(const struct intel_crtc_state *crtc_state,

			   const struct intel_plane_state *plane_state)

			   const struct intel_plane_state *plane_state)

{

{
@@ -9813,6 +9848,14 @@ static bool i845_cursor_get_hw_state(struct intel_plane *plane, 
	return ret;

	return ret;

}

}





static unsigned int

i9xx_cursor_max_stride(struct intel_plane *plane,

		       u32 pixel_format, u64 modifier,

		       unsigned int rotation)

{

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

}



static u32 i9xx_cursor_ctl(const struct intel_crtc_state *crtc_state,

static u32 i9xx_cursor_ctl(const struct intel_crtc_state *crtc_state,

			   const struct intel_plane_state *plane_state)

			   const struct intel_plane_state *plane_state)

{

{
@@ -13727,6 +13770,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) 
		else

		else

			modifiers = skl_format_modifiers_noccs;

			modifiers = skl_format_modifiers_noccs;





		primary->max_stride = skl_plane_max_stride;

		primary->update_plane = skl_update_plane;

		primary->update_plane = skl_update_plane;

		primary->disable_plane = skl_disable_plane;

		primary->disable_plane = skl_disable_plane;

		primary->get_hw_state = skl_plane_get_hw_state;

		primary->get_hw_state = skl_plane_get_hw_state;
@@ -13737,6 +13781,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) 
		num_formats = ARRAY_SIZE(i965_primary_formats);

		num_formats = ARRAY_SIZE(i965_primary_formats);

		modifiers = i9xx_format_modifiers;

		modifiers = i9xx_format_modifiers;





		primary->max_stride = i9xx_plane_max_stride;

		primary->update_plane = i9xx_update_plane;

		primary->update_plane = i9xx_update_plane;

		primary->disable_plane = i9xx_disable_plane;

		primary->disable_plane = i9xx_disable_plane;

		primary->get_hw_state = i9xx_plane_get_hw_state;

		primary->get_hw_state = i9xx_plane_get_hw_state;
@@ -13747,6 +13792,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) 
		num_formats = ARRAY_SIZE(i8xx_primary_formats);

		num_formats = ARRAY_SIZE(i8xx_primary_formats);

		modifiers = i9xx_format_modifiers;

		modifiers = i9xx_format_modifiers;





		primary->max_stride = i9xx_plane_max_stride;

		primary->update_plane = i9xx_update_plane;

		primary->update_plane = i9xx_update_plane;

		primary->disable_plane = i9xx_disable_plane;

		primary->disable_plane = i9xx_disable_plane;

		primary->get_hw_state = i9xx_plane_get_hw_state;

		primary->get_hw_state = i9xx_plane_get_hw_state;
@@ -13854,11 +13900,13 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv, 
	cursor->frontbuffer_bit = INTEL_FRONTBUFFER(pipe, cursor->id);

	cursor->frontbuffer_bit = INTEL_FRONTBUFFER(pipe, cursor->id);





	if (IS_I845G(dev_priv) || IS_I865G(dev_priv)) {

	if (IS_I845G(dev_priv) || IS_I865G(dev_priv)) {

		cursor->max_stride = i845_cursor_max_stride;

		cursor->update_plane = i845_update_cursor;

		cursor->update_plane = i845_update_cursor;

		cursor->disable_plane = i845_disable_cursor;

		cursor->disable_plane = i845_disable_cursor;

		cursor->get_hw_state = i845_cursor_get_hw_state;

		cursor->get_hw_state = i845_cursor_get_hw_state;

		cursor->check_plane = i845_check_cursor;

		cursor->check_plane = i845_check_cursor;

	} else {

	} else {

		cursor->max_stride = i9xx_cursor_max_stride;

		cursor->update_plane = i9xx_update_cursor;

		cursor->update_plane = i9xx_update_cursor;

		cursor->disable_plane = i9xx_disable_cursor;

		cursor->disable_plane = i9xx_disable_cursor;

		cursor->get_hw_state = i9xx_cursor_get_hw_state;

		cursor->get_hw_state = i9xx_cursor_get_hw_state;

drivers/gpu/drm/i915/intel_drv.h

+10 −0
Original line number Original line Diff line number Diff line
@@ -965,6 +965,9 @@ struct intel_plane { 
	 * the intel_plane_state structure and accessed via plane_state.

	 * the intel_plane_state structure and accessed via plane_state.

	 */

	 */





	unsigned int (*max_stride)(struct intel_plane *plane,

				   u32 pixel_format, u64 modifier,

				   unsigned int rotation);

	void (*update_plane)(struct intel_plane *plane,

	void (*update_plane)(struct intel_plane *plane,

			     const struct intel_crtc_state *crtc_state,

			     const struct intel_crtc_state *crtc_state,

			     const struct intel_plane_state *plane_state);

			     const struct intel_plane_state *plane_state);
@@ -1660,6 +1663,9 @@ int skl_check_plane_surface(const struct intel_crtc_state *crtc_state, 
			    struct intel_plane_state *plane_state);

			    struct intel_plane_state *plane_state);

int i9xx_check_plane_surface(struct intel_plane_state *plane_state);

int i9xx_check_plane_surface(struct intel_plane_state *plane_state);

int skl_format_to_fourcc(int format, bool rgb_order, bool alpha);

int skl_format_to_fourcc(int format, bool rgb_order, bool alpha);

unsigned int i9xx_plane_max_stride(struct intel_plane *plane,

				   u32 pixel_format, u64 modifier,

				   unsigned int rotation);





/* intel_csr.c */

/* intel_csr.c */

void intel_csr_ucode_init(struct drm_i915_private *);

void intel_csr_ucode_init(struct drm_i915_private *);
@@ -2127,6 +2133,10 @@ bool skl_plane_has_ccs(struct drm_i915_private *dev_priv, 
		       enum pipe pipe, enum plane_id plane_id);

		       enum pipe pipe, enum plane_id plane_id);

bool skl_plane_has_planar(struct drm_i915_private *dev_priv,

bool skl_plane_has_planar(struct drm_i915_private *dev_priv,

			  enum pipe pipe, enum plane_id plane_id);

			  enum pipe pipe, enum plane_id plane_id);

unsigned int skl_plane_max_stride(struct intel_plane *plane,

				  u32 pixel_format, u64 modifier,

				  unsigned int rotation);







/* intel_tv.c */

/* intel_tv.c */

void intel_tv_init(struct drm_i915_private *dev_priv);

void intel_tv_init(struct drm_i915_private *dev_priv);

drivers/gpu/drm/i915/intel_sprite.c

+32 −2
Original line number Original line Diff line number Diff line
@@ -230,6 +230,23 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state) 
#endif

#endif

}

}





unsigned int

skl_plane_max_stride(struct intel_plane *plane,

		     u32 pixel_format, u64 modifier,

		     unsigned int rotation)

{

	int cpp = drm_format_plane_cpp(pixel_format, 0);



	/*

	 * "The stride in bytes must not exceed the

	 * of the size of 8K pixels and 32K bytes."

	 */

	if (drm_rotation_90_or_270(rotation))

		return min(8192, 32768 / cpp);

	else

		return min(8192 * cpp, 32768);

}



void

void

skl_update_plane(struct intel_plane *plane,

skl_update_plane(struct intel_plane *plane,

		 const struct intel_crtc_state *crtc_state,

		 const struct intel_crtc_state *crtc_state,
@@ -800,6 +817,14 @@ ivb_plane_get_hw_state(struct intel_plane *plane, 
	return ret;

	return ret;

}

}





static unsigned int

g4x_sprite_max_stride(struct intel_plane *plane,

		      u32 pixel_format, u64 modifier,

		      unsigned int rotation)

{

	return 16384;

}



static u32 g4x_sprite_ctl(const struct intel_crtc_state *crtc_state,

static u32 g4x_sprite_ctl(const struct intel_crtc_state *crtc_state,

			  const struct intel_plane_state *plane_state)

			  const struct intel_plane_state *plane_state)

{

{
@@ -966,7 +991,6 @@ intel_check_sprite_plane(struct intel_crtc_state *crtc_state, 
	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);

	struct drm_framebuffer *fb = state->base.fb;

	struct drm_framebuffer *fb = state->base.fb;

	int max_stride = INTEL_GEN(dev_priv) >= 9 ? 32768 : 16384;

	int max_scale, min_scale;

	int max_scale, min_scale;

	bool can_scale;

	bool can_scale;

	int ret;

	int ret;
@@ -984,7 +1008,9 @@ intel_check_sprite_plane(struct intel_crtc_state *crtc_state, 
	}

	}





	/* FIXME check all gen limits */

	/* FIXME check all gen limits */

	if (fb->width < 3 || fb->height < 3 || fb->pitches[0] > max_stride) {

	if (fb->width < 3 || fb->height < 3 ||

	    fb->pitches[0] > plane->max_stride(plane, fb->format->format,

					       fb->modifier, DRM_MODE_ROTATE_0)) {

		DRM_DEBUG_KMS("Unsuitable framebuffer for plane\n");

		DRM_DEBUG_KMS("Unsuitable framebuffer for plane\n");

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -1529,6 +1555,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, 
		intel_plane->has_ccs = skl_plane_has_ccs(dev_priv, pipe,

		intel_plane->has_ccs = skl_plane_has_ccs(dev_priv, pipe,

							 PLANE_SPRITE0 + plane);

							 PLANE_SPRITE0 + plane);





		intel_plane->max_stride = skl_plane_max_stride;

		intel_plane->update_plane = skl_update_plane;

		intel_plane->update_plane = skl_update_plane;

		intel_plane->disable_plane = skl_disable_plane;

		intel_plane->disable_plane = skl_disable_plane;

		intel_plane->get_hw_state = skl_plane_get_hw_state;

		intel_plane->get_hw_state = skl_plane_get_hw_state;
@@ -1552,6 +1579,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, 
		intel_plane->can_scale = false;

		intel_plane->can_scale = false;

		intel_plane->max_downscale = 1;

		intel_plane->max_downscale = 1;





		intel_plane->max_stride = i9xx_plane_max_stride;

		intel_plane->update_plane = vlv_update_plane;

		intel_plane->update_plane = vlv_update_plane;

		intel_plane->disable_plane = vlv_disable_plane;

		intel_plane->disable_plane = vlv_disable_plane;

		intel_plane->get_hw_state = vlv_plane_get_hw_state;

		intel_plane->get_hw_state = vlv_plane_get_hw_state;
@@ -1570,6 +1598,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, 
			intel_plane->max_downscale = 1;

			intel_plane->max_downscale = 1;

		}

		}





		intel_plane->max_stride = g4x_sprite_max_stride;

		intel_plane->update_plane = ivb_update_plane;

		intel_plane->update_plane = ivb_update_plane;

		intel_plane->disable_plane = ivb_disable_plane;

		intel_plane->disable_plane = ivb_disable_plane;

		intel_plane->get_hw_state = ivb_plane_get_hw_state;

		intel_plane->get_hw_state = ivb_plane_get_hw_state;
@@ -1583,6 +1612,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, 
		intel_plane->can_scale = true;

		intel_plane->can_scale = true;

		intel_plane->max_downscale = 16;

		intel_plane->max_downscale = 16;





		intel_plane->max_stride = g4x_sprite_max_stride;

		intel_plane->update_plane = g4x_update_plane;

		intel_plane->update_plane = g4x_update_plane;

		intel_plane->disable_plane = g4x_disable_plane;

		intel_plane->disable_plane = g4x_disable_plane;

		intel_plane->get_hw_state = g4x_plane_get_hw_state;

		intel_plane->get_hw_state = g4x_plane_get_hw_state;

CRA Git | Maintained and supported by SUSTech CRA and CCSE