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

Commit 6711bd73 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915/gen11: Enable 6 sprites on gen11 



Gen11 supports 7 planes + 1 cursor on each pipe. Bump
I915_MAX_PLANES to 8, and set num_sprites correctly.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
[mlankhorst: Move the skl/bxt comment to the BXT branch. (Matt)]
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181018115134.9061-3-maarten.lankhorst@linux.intel.com
parent 24719e94

drivers/gpu/drm/i915/intel_device_info.c

+13 −9
Original line number Diff line number Diff line
@@ -752,6 +752,13 @@ void intel_device_info_runtime_init(struct intel_device_info *info) 


	BUILD_BUG_ON(I915_NUM_ENGINES > BITS_PER_TYPE(intel_ring_mask_t));



	if (IS_GEN11(dev_priv))

		for_each_pipe(dev_priv, pipe)

			info->num_sprites[pipe] = 6;

	else if (IS_GEN10(dev_priv) || IS_GEMINILAKE(dev_priv))

		for_each_pipe(dev_priv, pipe)

			info->num_sprites[pipe] = 3;

	else if (IS_BROXTON(dev_priv)) {

		/*

		 * Skylake and Broxton currently don't expose the topmost plane as its

		 * use is exclusive with the legacy cursor and we only want to expose
@@ -760,10 +767,7 @@ void intel_device_info_runtime_init(struct intel_device_info *info) 
		 * we don't expose the topmost plane at all to prevent ABI breakage

		 * down the line.

		 */

	if (IS_GEN10(dev_priv) || IS_GEMINILAKE(dev_priv))

		for_each_pipe(dev_priv, pipe)

			info->num_sprites[pipe] = 3;

	else if (IS_BROXTON(dev_priv)) {



		info->num_sprites[PIPE_A] = 2;

		info->num_sprites[PIPE_B] = 2;

		info->num_sprites[PIPE_C] = 1;

drivers/gpu/drm/i915/intel_display.h

+3 −0
Original line number Diff line number Diff line
@@ -122,6 +122,9 @@ enum plane_id { 
	PLANE_SPRITE0,

	PLANE_SPRITE1,

	PLANE_SPRITE2,

	PLANE_SPRITE3,

	PLANE_SPRITE4,

	PLANE_SPRITE5,

	PLANE_CURSOR,



	I915_MAX_PLANES,