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

Commit ec2c981e authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Use a common function for computing the fb height alignment 



If we need to change the fb height constraints, it sounds like a good
idea to have to do it in one place only.

v2: v2: Rebase on top of Ander's "Make intel_crtc->config a pointer"

Reviewed-By: Tvrtko Ursulin <tvrtko.ursulin@intel.com> (v1)
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 49af449b

drivers/gpu/drm/i915/intel_display.c

+11 −8
Original line number Diff line number Diff line
@@ -2188,11 +2188,12 @@ static bool need_vtd_wa(struct drm_device *dev) 
	return false;

}



static int intel_align_height(struct drm_device *dev, int height, bool tiled)

int

intel_fb_align_height(struct drm_device *dev, int height, unsigned int tiling)

{

	int tile_height;



	tile_height = tiled ? (IS_GEN2(dev) ? 16 : 8) : 1;

	tile_height = tiling ? (IS_GEN2(dev) ? 16 : 8) : 1;

	return ALIGN(height, tile_height);

}
@@ -6590,7 +6591,8 @@ static void i9xx_get_plane_config(struct intel_crtc *crtc, 
	val = I915_READ(DSPSTRIDE(pipe));

	crtc->base.primary->fb->pitches[0] = val & 0xffffffc0;



	aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,

	aligned_height = intel_fb_align_height(dev,

					       crtc->base.primary->fb->height,

					       plane_config->tiling);



	plane_config->size = PAGE_ALIGN(crtc->base.primary->fb->pitches[0] *
@@ -7644,7 +7646,8 @@ static void ironlake_get_plane_config(struct intel_crtc *crtc, 
	val = I915_READ(DSPSTRIDE(pipe));

	crtc->base.primary->fb->pitches[0] = val & 0xffffffc0;



	aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,

	aligned_height = intel_fb_align_height(dev,

					       crtc->base.primary->fb->height,

					       plane_config->tiling);



	plane_config->size = PAGE_ALIGN(crtc->base.primary->fb->pitches[0] *
@@ -12609,7 +12612,7 @@ static int intel_framebuffer_init(struct drm_device *dev, 
	if (mode_cmd->offsets[0] != 0)

		return -EINVAL;



	aligned_height = intel_align_height(dev, mode_cmd->height,

	aligned_height = intel_fb_align_height(dev, mode_cmd->height,

					       obj->tiling_mode);

	/* FIXME drm helper for size checks (especially planar formats)? */

	if (obj->base.size < aligned_height * mode_cmd->pitches[0])

drivers/gpu/drm/i915/intel_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -872,6 +872,8 @@ void intel_frontbuffer_flip(struct drm_device *dev, 
	intel_frontbuffer_flush(dev, frontbuffer_bits);

}



int intel_fb_align_height(struct drm_device *dev, int height,

			  unsigned int tiling);

void intel_fb_obj_flush(struct drm_i915_gem_object *obj, bool retire);

drivers/gpu/drm/i915/intel_fbdev.c

+2 −1
Original line number Diff line number Diff line
@@ -593,7 +593,8 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, 
		}



		cur_size = intel_crtc->config->base.adjusted_mode.crtc_vdisplay;

		cur_size = ALIGN(cur_size, plane_config->tiling ? (IS_GEN2(dev) ? 16 : 8) : 1);

		cur_size = intel_fb_align_height(dev, cur_size,

						 plane_config->tiling);

		cur_size *= fb->base.pitches[0];

		DRM_DEBUG_KMS("pipe %c area: %dx%d, bpp: %d, size: %d\n",

			      pipe_name(intel_crtc->pipe),