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

Commit 57b19d55 authored by Oscar Mateo's avatar Oscar Mateo Committed by Chris Wilson
Browse files

drm/i915/icl: Record the valid VDBoxes with SFC capability 



In Gen11, only even numbered "logical" VDBoxes are hooked up to an SFC
(Scaler & Format Converter) unit. We will use this information to decide
when the SFC units need to be reset.

BSpec: 20189

Signed-off-by: default avatarTomasz Lis <tomasz.lis@intel.com>
Signed-off-by: default avatarOscar Mateo <oscar.mateo@intel.com>
Signed-off-by: default avatarMichel Thierry <michel.thierry@intel.com>
Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michel Thierry <michel.thierry@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181213091522.2926-3-chris@chris-wilson.co.uk
parent 921f3a60

drivers/gpu/drm/i915/intel_device_info.c

+10 −1
Original line number Diff line number Diff line
@@ -884,8 +884,9 @@ void intel_driver_caps_print(const struct intel_driver_caps *caps, 
void intel_device_info_init_mmio(struct drm_i915_private *dev_priv)

{

	struct intel_device_info *info = mkwrite_device_info(dev_priv);

	u32 media_fuse;

	unsigned int logical_vdbox = 0;

	unsigned int i;

	u32 media_fuse;



	if (INTEL_GEN(dev_priv) < 11)

		return;
@@ -904,7 +905,15 @@ void intel_device_info_init_mmio(struct drm_i915_private *dev_priv) 
		if (!(BIT(i) & info->vdbox_enable)) {

			info->ring_mask &= ~ENGINE_MASK(_VCS(i));

			DRM_DEBUG_DRIVER("vcs%u fused off\n", i);

			continue;

		}



		/*

		 * In Gen11, only even numbered logical VDBOXes are

		 * hooked up to an SFC (Scaler & Format Converter) unit.

		 */

		if (logical_vdbox++ % 2 == 0)

			info->vdbox_sfc_access |= BIT(i);

	}



	DRM_DEBUG_DRIVER("vebox enable: %04x\n", info->vebox_enable);

drivers/gpu/drm/i915/intel_device_info.h

+3 −0
Original line number Diff line number Diff line
@@ -198,6 +198,9 @@ struct intel_device_info { 
	u8 vdbox_enable;

	u8 vebox_enable;



	/* Media engine access to SFC per instance */

	u8 vdbox_sfc_access;



	struct color_luts {

		u16 degamma_lut_size;

		u16 gamma_lut_size;