[Intel-gfx] [PATCH 06/19] drm/i915/icl: Record the valid VDBoxes with SFC capability

[Tvrtko Ursulin]

On 12/12/2018 13:41, Chris Wilson wrote:
> From: Oscar Mateo <oscar.mateo at intel.com>
> 
> 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: Tomasz Lis <tomasz.lis at intel.com>
> Signed-off-by: Oscar Mateo <oscar.mateo at intel.com>
> Signed-off-by: Michel Thierry <michel.thierry at intel.com>
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
> Cc: Michel Thierry <michel.thierry at intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>   drivers/gpu/drm/i915/intel_device_info.c | 11 ++++++++++-
>   drivers/gpu/drm/i915/intel_device_info.h |  3 +++
>   2 files changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index bd5c4d62c635..acd7ee74d308 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -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);
> diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
> index 1caf24e2cf0b..dd34f974a857 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.h
> +++ b/drivers/gpu/drm/i915/intel_device_info.h
> @@ -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;
> 

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko