Commit 1649a4cc authored by Matt Roper's avatar Matt Roper
Browse files

drm/i915/xelpd: Define plane capabilities 



XE_LPD's plane support is identical to RKL and ADL-S --- 5 universal + 1
cursor with NV12 UV support on planes 1-3 and NV12 Y support on planes
4-5.

v2:
 - Drop the extra 90/270 rotation check in skl_plane_check_fb(); the DRM
   property code will already prevent userspace from passing us values
   that weren't advertised.  (Lucas)

Bspec: 53657
Bspec: 49251
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210512042144.2089071-3-matthew.d.roper@intel.com
parent 20fe778f

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

+7 −4
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ int skl_format_to_fourcc(int format, bool rgb_order, bool alpha) 


static u8 icl_nv12_y_plane_mask(struct drm_i915_private *i915)

{

	if (HAS_D12_PLANE_MINIMIZATION(i915))

	if (DISPLAY_VER(i915) >= 13 || HAS_D12_PLANE_MINIMIZATION(i915))

		return BIT(PLANE_SPRITE2) | BIT(PLANE_SPRITE3);

	else

		return BIT(PLANE_SPRITE4) | BIT(PLANE_SPRITE5);
@@ -2094,6 +2094,9 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv, 
	if (ret)

		goto fail;



	if (DISPLAY_VER(dev_priv) >= 13)

		supported_rotations = DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180;

	else

		supported_rotations =

			DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_90 |

			DRM_MODE_ROTATE_180 | DRM_MODE_ROTATE_270;

drivers/gpu/drm/i915/i915_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -2309,7 +2309,7 @@ static u32 gen8_de_port_aux_mask(struct drm_i915_private *dev_priv) 


static u32 gen8_de_pipe_fault_mask(struct drm_i915_private *dev_priv)

{

	if (HAS_D12_PLANE_MINIMIZATION(dev_priv))

	if (DISPLAY_VER(dev_priv) >= 13 || HAS_D12_PLANE_MINIMIZATION(dev_priv))

		return RKL_DE_PIPE_IRQ_FAULT_ERRORS;

	else if (DISPLAY_VER(dev_priv) >= 11)

		return GEN11_DE_PIPE_IRQ_FAULT_ERRORS;

drivers/gpu/drm/i915/intel_device_info.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) 


	BUILD_BUG_ON(BITS_PER_TYPE(intel_engine_mask_t) < I915_NUM_ENGINES);



	if (HAS_D12_PLANE_MINIMIZATION(dev_priv))

	if (DISPLAY_VER(dev_priv) >= 13 || HAS_D12_PLANE_MINIMIZATION(dev_priv))

		for_each_pipe(dev_priv, pipe)

			runtime->num_sprites[pipe] = 4;

	else if (INTEL_GEN(dev_priv) >= 11)