Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/i915: Pass 90/270 vs. 0/180 rotation info for intel_gen4_compute_page_offset() 



The page aligned surface address calculation needs to know which way
things are rotated. The contract now says that the caller must pass the
rotate x/y coordinates, as well as the tile_height aligned stride in
the tile_height direction. This will make it fairly simple to deal with
90/270 degree rotation on SKL+ where we have to deal with the rotated
view into the GTT.

v2: Pass rotation instead of bool even thoughwe only care about 0/180 vs. 90/270
v3: Introduce intel_tile_dims(), and don't mix up different units so much
v4: Unconfuse bytes vs. pixels even more

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1455569699-27905-4-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 27ba3910

drivers/gpu/drm/i915/intel_display.c

+51 −21
Original line number Original line Diff line number Diff line
@@ -2272,6 +2272,20 @@ unsigned int intel_tile_height(const struct drm_i915_private *dev_priv, 
			intel_tile_width_bytes(dev_priv, fb_modifier, cpp);

			intel_tile_width_bytes(dev_priv, fb_modifier, cpp);

}

}





/* Return the tile dimensions in pixel units */

static void intel_tile_dims(const struct drm_i915_private *dev_priv,

			    unsigned int *tile_width,

			    unsigned int *tile_height,

			    uint64_t fb_modifier,

			    unsigned int cpp)

{

	unsigned int tile_width_bytes =

		intel_tile_width_bytes(dev_priv, fb_modifier, cpp);



	*tile_width = tile_width_bytes / cpp;

	*tile_height = intel_tile_size(dev_priv) / tile_width_bytes;

}



unsigned int

unsigned int

intel_fb_align_height(struct drm_device *dev, unsigned int height,

intel_fb_align_height(struct drm_device *dev, unsigned int height,

		      uint32_t pixel_format, uint64_t fb_modifier)

		      uint32_t pixel_format, uint64_t fb_modifier)
@@ -2288,7 +2302,7 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, 
{

{

	struct drm_i915_private *dev_priv = to_i915(fb->dev);

	struct drm_i915_private *dev_priv = to_i915(fb->dev);

	struct intel_rotation_info *info = &view->params.rotated;

	struct intel_rotation_info *info = &view->params.rotated;

	unsigned int tile_size, tile_width_bytes, tile_height, cpp;

	unsigned int tile_size, tile_width, tile_height, cpp;





	*view = i915_ggtt_view_normal;

	*view = i915_ggtt_view_normal;
@@ -2309,19 +2323,19 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, 
	tile_size = intel_tile_size(dev_priv);

	tile_size = intel_tile_size(dev_priv);





	cpp = drm_format_plane_cpp(fb->pixel_format, 0);

	cpp = drm_format_plane_cpp(fb->pixel_format, 0);

	tile_width_bytes = intel_tile_width_bytes(dev_priv, fb->modifier[0], cpp);

	intel_tile_dims(dev_priv, &tile_width, &tile_height,

	tile_height = tile_size / tile_width_bytes;

			fb->modifier[0], cpp);





	info->width_pages = DIV_ROUND_UP(fb->pitches[0], tile_width_bytes);

	info->width_pages = DIV_ROUND_UP(fb->pitches[0], tile_width * cpp);

	info->height_pages = DIV_ROUND_UP(fb->height, tile_height);

	info->height_pages = DIV_ROUND_UP(fb->height, tile_height);

	info->size = info->width_pages * info->height_pages * tile_size;

	info->size = info->width_pages * info->height_pages * tile_size;





	if (info->pixel_format == DRM_FORMAT_NV12) {

	if (info->pixel_format == DRM_FORMAT_NV12) {

		cpp = drm_format_plane_cpp(fb->pixel_format, 1);

		cpp = drm_format_plane_cpp(fb->pixel_format, 1);

		tile_width_bytes = intel_tile_width_bytes(dev_priv, fb->modifier[1], cpp);

		intel_tile_dims(dev_priv, &tile_width, &tile_height,

		tile_height = tile_size / tile_width_bytes;

				fb->modifier[1], cpp);





		info->width_pages_uv = DIV_ROUND_UP(fb->pitches[1], tile_width_bytes);

		info->width_pages_uv = DIV_ROUND_UP(fb->pitches[1], tile_width * cpp);

		info->height_pages_uv = DIV_ROUND_UP(fb->height / 2, tile_height);

		info->height_pages_uv = DIV_ROUND_UP(fb->height / 2, tile_height);

		info->size_uv = info->width_pages_uv * info->height_pages_uv * tile_size;

		info->size_uv = info->width_pages_uv * info->height_pages_uv * tile_size;

	}

	}
@@ -2449,29 +2463,43 @@ static void intel_unpin_fb_obj(struct drm_framebuffer *fb, 
	i915_gem_object_unpin_from_display_plane(obj, &view);

	i915_gem_object_unpin_from_display_plane(obj, &view);

}

}





/* Computes the linear offset to the base tile and adjusts x, y. bytes per pixel

/*

 * is assumed to be a power-of-two. */

 * Computes the linear offset to the base tile and adjusts

 * x, y. bytes per pixel is assumed to be a power-of-two.

 *

 * In the 90/270 rotated case, x and y are assumed

 * to be already rotated to match the rotated GTT view, and

 * pitch is the tile_height aligned framebuffer height.

 */

u32 intel_compute_tile_offset(struct drm_i915_private *dev_priv,

u32 intel_compute_tile_offset(struct drm_i915_private *dev_priv,

			      int *x, int *y,

			      int *x, int *y,

			      uint64_t fb_modifier,

			      uint64_t fb_modifier,

			      unsigned int cpp,

			      unsigned int cpp,

			      unsigned int pitch)

			      unsigned int pitch,

			      unsigned int rotation)

{

{

	if (fb_modifier != DRM_FORMAT_MOD_NONE) {

	if (fb_modifier != DRM_FORMAT_MOD_NONE) {

		unsigned int tile_size, tile_width_bytes, tile_height;

		unsigned int tile_size, tile_width, tile_height;

		unsigned int tile_rows, tiles;

		unsigned int tile_rows, tiles, pitch_tiles;





		tile_size = intel_tile_size(dev_priv);

		tile_size = intel_tile_size(dev_priv);

		tile_width_bytes = intel_tile_width_bytes(dev_priv, fb_modifier, cpp);

		intel_tile_dims(dev_priv, &tile_width, &tile_height,

		tile_height = tile_size / tile_width_bytes;

				fb_modifier, cpp);



		if (intel_rotation_90_or_270(rotation)) {

			pitch_tiles = pitch / tile_height;

			swap(tile_width, tile_height);

		} else {

			pitch_tiles = pitch / (tile_width * cpp);

		}





		tile_rows = *y / tile_height;

		tile_rows = *y / tile_height;

		*y %= tile_height;

		*y %= tile_height;





		tiles = *x / (tile_width_bytes/cpp);

		tiles = *x / tile_width;

		*x %= tile_width_bytes/cpp;

		*x %= tile_width;





		return tile_rows * pitch * tile_height + tiles * tile_size;

		return (tile_rows * pitch_tiles + tiles) * tile_size;

	} else {

	} else {

		unsigned int alignment = intel_linear_alignment(dev_priv) - 1;

		unsigned int alignment = intel_linear_alignment(dev_priv) - 1;

		unsigned int offset;

		unsigned int offset;
@@ -2716,6 +2744,7 @@ static void i9xx_update_primary_plane(struct drm_plane *primary, 
	u32 linear_offset;

	u32 linear_offset;

	u32 dspcntr;

	u32 dspcntr;

	i915_reg_t reg = DSPCNTR(plane);

	i915_reg_t reg = DSPCNTR(plane);

	unsigned int rotation = plane_state->base.rotation;

	int cpp = drm_format_plane_cpp(fb->pixel_format, 0);

	int cpp = drm_format_plane_cpp(fb->pixel_format, 0);

	int x = plane_state->src.x1 >> 16;

	int x = plane_state->src.x1 >> 16;

	int y = plane_state->src.y1 >> 16;

	int y = plane_state->src.y1 >> 16;
@@ -2782,13 +2811,13 @@ static void i9xx_update_primary_plane(struct drm_plane *primary, 
		intel_crtc->dspaddr_offset =

		intel_crtc->dspaddr_offset =

			intel_compute_tile_offset(dev_priv, &x, &y,

			intel_compute_tile_offset(dev_priv, &x, &y,

						  fb->modifier[0], cpp,

						  fb->modifier[0], cpp,

						  fb->pitches[0]);

						  fb->pitches[0], rotation);

		linear_offset -= intel_crtc->dspaddr_offset;

		linear_offset -= intel_crtc->dspaddr_offset;

	} else {

	} else {

		intel_crtc->dspaddr_offset = linear_offset;

		intel_crtc->dspaddr_offset = linear_offset;

	}

	}





	if (plane_state->base.rotation == BIT(DRM_ROTATE_180)) {

	if (rotation == BIT(DRM_ROTATE_180)) {

		dspcntr |= DISPPLANE_ROTATE_180;

		dspcntr |= DISPPLANE_ROTATE_180;





		x += (crtc_state->pipe_src_w - 1);

		x += (crtc_state->pipe_src_w - 1);
@@ -2846,6 +2875,7 @@ static void ironlake_update_primary_plane(struct drm_plane *primary, 
	u32 linear_offset;

	u32 linear_offset;

	u32 dspcntr;

	u32 dspcntr;

	i915_reg_t reg = DSPCNTR(plane);

	i915_reg_t reg = DSPCNTR(plane);

	unsigned int rotation = plane_state->base.rotation;

	int cpp = drm_format_plane_cpp(fb->pixel_format, 0);

	int cpp = drm_format_plane_cpp(fb->pixel_format, 0);

	int x = plane_state->src.x1 >> 16;

	int x = plane_state->src.x1 >> 16;

	int y = plane_state->src.y1 >> 16;

	int y = plane_state->src.y1 >> 16;
@@ -2889,9 +2919,9 @@ static void ironlake_update_primary_plane(struct drm_plane *primary, 
	intel_crtc->dspaddr_offset =

	intel_crtc->dspaddr_offset =

		intel_compute_tile_offset(dev_priv, &x, &y,

		intel_compute_tile_offset(dev_priv, &x, &y,

					  fb->modifier[0], cpp,

					  fb->modifier[0], cpp,

					  fb->pitches[0]);

					  fb->pitches[0], rotation);

	linear_offset -= intel_crtc->dspaddr_offset;

	linear_offset -= intel_crtc->dspaddr_offset;

	if (plane_state->base.rotation == BIT(DRM_ROTATE_180)) {

	if (rotation == BIT(DRM_ROTATE_180)) {

		dspcntr |= DISPPLANE_ROTATE_180;

		dspcntr |= DISPPLANE_ROTATE_180;





		if (!IS_HASWELL(dev) && !IS_BROADWELL(dev)) {

		if (!IS_HASWELL(dev) && !IS_BROADWELL(dev)) {

drivers/gpu/drm/i915/intel_drv.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -1199,7 +1199,8 @@ u32 intel_compute_tile_offset(struct drm_i915_private *dev_priv, 
			      int *x, int *y,

			      int *x, int *y,

			      uint64_t fb_modifier,

			      uint64_t fb_modifier,

			      unsigned int cpp,

			      unsigned int cpp,

			      unsigned int pitch);

			      unsigned int pitch,

			      unsigned int rotation);

void intel_prepare_reset(struct drm_device *dev);

void intel_prepare_reset(struct drm_device *dev);

void intel_finish_reset(struct drm_device *dev);

void intel_finish_reset(struct drm_device *dev);

void hsw_enable_pc8(struct drm_i915_private *dev_priv);

void hsw_enable_pc8(struct drm_i915_private *dev_priv);

drivers/gpu/drm/i915/intel_sprite.c

+10 −8
Original line number Original line Diff line number Diff line
@@ -193,7 +193,7 @@ skl_update_plane(struct drm_plane *drm_plane, 
	const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;

	const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;

	u32 surf_addr;

	u32 surf_addr;

	u32 tile_height, plane_offset, plane_size;

	u32 tile_height, plane_offset, plane_size;

	unsigned int rotation;

	unsigned int rotation = plane_state->base.rotation;

	int x_offset, y_offset;

	int x_offset, y_offset;

	int crtc_x = plane_state->dst.x1;

	int crtc_x = plane_state->dst.x1;

	int crtc_y = plane_state->dst.y1;

	int crtc_y = plane_state->dst.y1;
@@ -213,7 +213,6 @@ skl_update_plane(struct drm_plane *drm_plane, 
	plane_ctl |= skl_plane_ctl_format(fb->pixel_format);

	plane_ctl |= skl_plane_ctl_format(fb->pixel_format);

	plane_ctl |= skl_plane_ctl_tiling(fb->modifier[0]);

	plane_ctl |= skl_plane_ctl_tiling(fb->modifier[0]);





	rotation = plane_state->base.rotation;

	plane_ctl |= skl_plane_ctl_rotation(rotation);

	plane_ctl |= skl_plane_ctl_rotation(rotation);





	stride_div = intel_fb_stride_alignment(dev_priv, fb->modifier[0],

	stride_div = intel_fb_stride_alignment(dev_priv, fb->modifier[0],
@@ -351,6 +350,7 @@ vlv_update_plane(struct drm_plane *dplane, 
	int plane = intel_plane->plane;

	int plane = intel_plane->plane;

	u32 sprctl;

	u32 sprctl;

	u32 sprsurf_offset, linear_offset;

	u32 sprsurf_offset, linear_offset;

	unsigned int rotation = dplane->state->rotation;

	int cpp = drm_format_plane_cpp(fb->pixel_format, 0);

	int cpp = drm_format_plane_cpp(fb->pixel_format, 0);

	const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;

	const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;

	int crtc_x = plane_state->dst.x1;

	int crtc_x = plane_state->dst.x1;
@@ -425,10 +425,10 @@ vlv_update_plane(struct drm_plane *dplane, 
	linear_offset = y * fb->pitches[0] + x * cpp;

	linear_offset = y * fb->pitches[0] + x * cpp;

	sprsurf_offset = intel_compute_tile_offset(dev_priv, &x, &y,

	sprsurf_offset = intel_compute_tile_offset(dev_priv, &x, &y,

						   fb->modifier[0], cpp,

						   fb->modifier[0], cpp,

						   fb->pitches[0]);

						   fb->pitches[0], rotation);

	linear_offset -= sprsurf_offset;

	linear_offset -= sprsurf_offset;





	if (plane_state->base.rotation == BIT(DRM_ROTATE_180)) {

	if (rotation == BIT(DRM_ROTATE_180)) {

		sprctl |= SP_ROTATE_180;

		sprctl |= SP_ROTATE_180;





		x += src_w;

		x += src_w;
@@ -493,6 +493,7 @@ ivb_update_plane(struct drm_plane *plane, 
	enum pipe pipe = intel_plane->pipe;

	enum pipe pipe = intel_plane->pipe;

	u32 sprctl, sprscale = 0;

	u32 sprctl, sprscale = 0;

	u32 sprsurf_offset, linear_offset;

	u32 sprsurf_offset, linear_offset;

	unsigned int rotation = plane_state->base.rotation;

	int cpp = drm_format_plane_cpp(fb->pixel_format, 0);

	int cpp = drm_format_plane_cpp(fb->pixel_format, 0);

	const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;

	const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;

	int crtc_x = plane_state->dst.x1;

	int crtc_x = plane_state->dst.x1;
@@ -558,10 +559,10 @@ ivb_update_plane(struct drm_plane *plane, 
	linear_offset = y * fb->pitches[0] + x * cpp;

	linear_offset = y * fb->pitches[0] + x * cpp;

	sprsurf_offset = intel_compute_tile_offset(dev_priv, &x, &y,

	sprsurf_offset = intel_compute_tile_offset(dev_priv, &x, &y,

						   fb->modifier[0], cpp,

						   fb->modifier[0], cpp,

						   fb->pitches[0]);

						   fb->pitches[0], rotation);

	linear_offset -= sprsurf_offset;

	linear_offset -= sprsurf_offset;





	if (plane_state->base.rotation == BIT(DRM_ROTATE_180)) {

	if (rotation == BIT(DRM_ROTATE_180)) {

		sprctl |= SPRITE_ROTATE_180;

		sprctl |= SPRITE_ROTATE_180;





		/* HSW and BDW does this automagically in hardware */

		/* HSW and BDW does this automagically in hardware */
@@ -634,6 +635,7 @@ ilk_update_plane(struct drm_plane *plane, 
	int pipe = intel_plane->pipe;

	int pipe = intel_plane->pipe;

	u32 dvscntr, dvsscale;

	u32 dvscntr, dvsscale;

	u32 dvssurf_offset, linear_offset;

	u32 dvssurf_offset, linear_offset;

	unsigned int rotation = plane_state->base.rotation;

	int cpp = drm_format_plane_cpp(fb->pixel_format, 0);

	int cpp = drm_format_plane_cpp(fb->pixel_format, 0);

	const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;

	const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;

	int crtc_x = plane_state->dst.x1;

	int crtc_x = plane_state->dst.x1;
@@ -695,10 +697,10 @@ ilk_update_plane(struct drm_plane *plane, 
	linear_offset = y * fb->pitches[0] + x * cpp;

	linear_offset = y * fb->pitches[0] + x * cpp;

	dvssurf_offset = intel_compute_tile_offset(dev_priv, &x, &y,

	dvssurf_offset = intel_compute_tile_offset(dev_priv, &x, &y,

						   fb->modifier[0], cpp,

						   fb->modifier[0], cpp,

						   fb->pitches[0]);

						   fb->pitches[0], rotation);

	linear_offset -= dvssurf_offset;

	linear_offset -= dvssurf_offset;





	if (plane_state->base.rotation == BIT(DRM_ROTATE_180)) {

	if (rotation == BIT(DRM_ROTATE_180)) {

		dvscntr |= DVS_ROTATE_180;

		dvscntr |= DVS_ROTATE_180;





		x += src_w;

		x += src_w;