drm/i915: Fix skl+ max plane width (372b9ffb) · Commits · 戴 / test

drivers/gpu/drm/i915/intel_display.c

+47 −25

Original line number	Diff line number	Diff line
		@@ -2964,41 +2964,55 @@ static int skl_max_plane_width(const struct drm_framebuffer *fb,
		switch (fb->modifier) {
		case DRM_FORMAT_MOD_LINEAR:
		case I915_FORMAT_MOD_X_TILED:
		switch (cpp) {
		case 8:
		return 4096;
		case 4:
		case 2:
		case 1:
		return 8192;
		default:
		MISSING_CASE(cpp);
		break;
		}
		break;
		case I915_FORMAT_MOD_Y_TILED_CCS:
		case I915_FORMAT_MOD_Yf_TILED_CCS:
		/* FIXME AUX plane? */
		case I915_FORMAT_MOD_Y_TILED:
		case I915_FORMAT_MOD_Yf_TILED:
		switch (cpp) {
		case 8:
		if (cpp == 8)
		return 2048;
		case 4:
		else
		return 4096;
		case 2:
		case 1:
		return 8192;
		default:
		MISSING_CASE(cpp);
		break;
		MISSING_CASE(fb->modifier);
		return 2048;
		}
		break;
		}

		static int glk_max_plane_width(const struct drm_framebuffer *fb,
		int color_plane,
		unsigned int rotation)
		{
		int cpp = fb->format->cpp[color_plane];

		switch (fb->modifier) {
		case DRM_FORMAT_MOD_LINEAR:
		case I915_FORMAT_MOD_X_TILED:
		if (cpp == 8)
		return 4096;
		else
		return 5120;
		case I915_FORMAT_MOD_Y_TILED_CCS:
		case I915_FORMAT_MOD_Yf_TILED_CCS:
		/* FIXME AUX plane? */
		case I915_FORMAT_MOD_Y_TILED:
		case I915_FORMAT_MOD_Yf_TILED:
		if (cpp == 8)
		return 2048;
		else
		return 5120;
		default:
		MISSING_CASE(fb->modifier);
		return 2048;
		}
		}

		return 2048;
		static int icl_max_plane_width(const struct drm_framebuffer *fb,
		int color_plane,
		unsigned int rotation)
		{
		return 5120;
		}

		static bool skl_check_main_ccs_coordinates(struct intel_plane_state *plane_state,
		@@ -3041,16 +3055,24 @@ static bool skl_check_main_ccs_coordinates(struct intel_plane_state *plane_state

		static int skl_check_main_surface(struct intel_plane_state *plane_state)
		{
		struct drm_i915_private *dev_priv = to_i915(plane_state->base.plane->dev);
		const struct drm_framebuffer *fb = plane_state->base.fb;
		unsigned int rotation = plane_state->base.rotation;
		int x = plane_state->base.src.x1 >> 16;
		int y = plane_state->base.src.y1 >> 16;
		int w = drm_rect_width(&plane_state->base.src) >> 16;
		int h = drm_rect_height(&plane_state->base.src) >> 16;
		int max_width = skl_max_plane_width(fb, 0, rotation);
		int max_width;
		int max_height = 4096;
		u32 alignment, offset, aux_offset = plane_state->color_plane[1].offset;

		if (INTEL_GEN(dev_priv) >= 11)
		max_width = icl_max_plane_width(fb, 0, rotation);
		else if (INTEL_GEN(dev_priv) >= 10 \|\| IS_GEMINILAKE(dev_priv))
		max_width = glk_max_plane_width(fb, 0, rotation);
		else
		max_width = skl_max_plane_width(fb, 0, rotation);

		if (w > max_width \|\| h > max_height) {
		DRM_DEBUG_KMS("requested Y/RGB source size %dx%d too big (limit %dx%d)\n",
		w, h, max_width, max_height);

Admin message