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

Commit fe47ea0c authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Daniel Vetter
Browse files

drm/i915: Support planar formats in tile height calculations 



This will be needed for NV12 support.

v2: Rebase.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5ca4163a

drivers/gpu/drm/i915/intel_display.c

+5 −5
Original line number Diff line number Diff line
@@ -2190,7 +2190,7 @@ static bool need_vtd_wa(struct drm_device *dev) 


unsigned int

intel_tile_height(struct drm_device *dev, uint32_t pixel_format,

		  uint64_t fb_format_modifier)

		  uint64_t fb_format_modifier, unsigned int plane)

{

	unsigned int tile_height;

	uint32_t pixel_bytes;
@@ -2206,7 +2206,7 @@ intel_tile_height(struct drm_device *dev, uint32_t pixel_format, 
		tile_height = 32;

		break;

	case I915_FORMAT_MOD_Yf_TILED:

		pixel_bytes = drm_format_plane_cpp(pixel_format, 0);

		pixel_bytes = drm_format_plane_cpp(pixel_format, plane);

		switch (pixel_bytes) {

		default:

		case 1:
@@ -2240,7 +2240,7 @@ intel_fb_align_height(struct drm_device *dev, unsigned int height, 
		      uint32_t pixel_format, uint64_t fb_format_modifier)

{

	return ALIGN(height, intel_tile_height(dev, pixel_format,

					       fb_format_modifier));

					       fb_format_modifier, 0));

}



static int
@@ -2266,7 +2266,7 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, 
	info->fb_modifier = fb->modifier[0];



	tile_height = intel_tile_height(fb->dev, fb->pixel_format,

					fb->modifier[0]);

					fb->modifier[0], 0);

	tile_pitch = PAGE_SIZE / tile_height;

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

	info->height_pages = DIV_ROUND_UP(fb->height, tile_height);
@@ -3075,7 +3075,7 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc, 
	if (intel_rotation_90_or_270(rotation)) {

		/* stride = Surface height in tiles */

		tile_height = intel_tile_height(dev, fb->pixel_format,

						fb->modifier[0]);

						fb->modifier[0], 0);

		stride = DIV_ROUND_UP(fb->height, tile_height);

		x_offset = stride * tile_height - y - src_h;

		y_offset = x;

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state, 


unsigned int

intel_tile_height(struct drm_device *dev, uint32_t pixel_format,

		  uint64_t fb_format_modifier);

		  uint64_t fb_format_modifier, unsigned int plane);



static inline bool

intel_rotation_90_or_270(unsigned int rotation)

drivers/gpu/drm/i915/intel_sprite.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc, 
	if (intel_rotation_90_or_270(rotation)) {

		/* stride: Surface height in tiles */

		tile_height = intel_tile_height(dev, fb->pixel_format,

						fb->modifier[0]);

						fb->modifier[0], 0);

		stride = DIV_ROUND_UP(fb->height, tile_height);

		plane_size = (src_w << 16) | src_h;

		x_offset = stride * tile_height - y - (src_h + 1);