Commit e91c8a29 authored by Manasi Navare's avatar Manasi Navare Committed by Maarten Lankhorst
Browse files

drm/i915/display/icl: Bump up the plane/fb height 



On ICL+, the max supported plane height is 4320, so bump it up
To support 4320, we need to increase the number of bits used to
read plane_height to 13 as opposed to older 12 bits.

v4:
* Adjust the width mask also since extra bits are mbz (Ville)
v3:
* Use 0xffff for mask as extra bits are mbz (Ville)
v2:
* ICL plane height supported is 4320 (Ville)
* Add a new line between max width and max height (Jose)

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190712203808.4126-1-manasi.d.navare@intel.com
parent 12a97df0

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

+18 −3
Original line number Original line Diff line number Diff line
@@ -3333,6 +3333,16 @@ static int icl_max_plane_width(const struct drm_framebuffer *fb, 
	return 5120;

	return 5120;

}

}





static int skl_max_plane_height(void)

{

	return 4096;

}



static int icl_max_plane_height(void)

{

	return 4320;

}



static bool skl_check_main_ccs_coordinates(struct intel_plane_state *plane_state,

static bool skl_check_main_ccs_coordinates(struct intel_plane_state *plane_state,

					   int main_x, int main_y, u32 main_offset)

					   int main_x, int main_y, u32 main_offset)

{

{
@@ -3381,7 +3391,7 @@ static int skl_check_main_surface(struct intel_plane_state *plane_state) 
	int w = drm_rect_width(&plane_state->base.src) >> 16;

	int w = drm_rect_width(&plane_state->base.src) >> 16;

	int h = drm_rect_height(&plane_state->base.src) >> 16;

	int h = drm_rect_height(&plane_state->base.src) >> 16;

	int max_width;

	int max_width;

	int max_height = 4096;

	int max_height;

	u32 alignment, offset, aux_offset = plane_state->color_plane[1].offset;

	u32 alignment, offset, aux_offset = plane_state->color_plane[1].offset;





	if (INTEL_GEN(dev_priv) >= 11)

	if (INTEL_GEN(dev_priv) >= 11)
@@ -3391,6 +3401,11 @@ static int skl_check_main_surface(struct intel_plane_state *plane_state) 
	else

	else

		max_width = skl_max_plane_width(fb, 0, rotation);

		max_width = skl_max_plane_width(fb, 0, rotation);





	if (INTEL_GEN(dev_priv) >= 11)

		max_height = icl_max_plane_height();

	else

		max_height = skl_max_plane_height();



	if (w > max_width || h > max_height) {

	if (w > max_width || h > max_height) {

		DRM_DEBUG_KMS("requested Y/RGB source size %dx%d too big (limit %dx%d)\n",

		DRM_DEBUG_KMS("requested Y/RGB source size %dx%d too big (limit %dx%d)\n",

			      w, h, max_width, max_height);

			      w, h, max_width, max_height);
@@ -9873,8 +9888,8 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc, 
	offset = I915_READ(PLANE_OFFSET(pipe, plane_id));

	offset = I915_READ(PLANE_OFFSET(pipe, plane_id));





	val = I915_READ(PLANE_SIZE(pipe, plane_id));

	val = I915_READ(PLANE_SIZE(pipe, plane_id));

	fb->height = ((val >> 16) & 0xfff) + 1;

	fb->height = ((val >> 16) & 0xffff) + 1;

	fb->width = ((val >> 0) & 0x1fff) + 1;

	fb->width = ((val >> 0) & 0xffff) + 1;





	val = I915_READ(PLANE_STRIDE(pipe, plane_id));

	val = I915_READ(PLANE_STRIDE(pipe, plane_id));

	stride_mult = skl_plane_stride_mult(fb, 0, DRM_MODE_ROTATE_0);

	stride_mult = skl_plane_stride_mult(fb, 0, DRM_MODE_ROTATE_0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE