On Tue, Jul 13, 2021 at 08:14:53PM -0700, Matt Roper wrote:
> From: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
> 
> On Xe_HP the fusing register is renamed and changed to have the "enable"
> semantics, but otherwise remains compatible (mmio address, bitmask
> ranges) with older platforms.
> 
> To simplify things we do not add a new register definition but just stop
> inverting the fusing masks before processing them.
> 
> Bspec: 52615
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospu...@intel.com>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
> Signed-off-by: Matt Roper <matthew.d.ro...@intel.com>
> Reviewed-by: Lucas De Marchi <lucas.demar...@intel.com>
Reviewed-by: Matt Atwood <matthew.s.atw...@intel.com>
> ---
>  drivers/gpu/drm/i915/gt/intel_engine_cs.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c 
> b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> index d561573ed98c..5cfeb91d1b7b 100644
> --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> @@ -468,7 +468,14 @@ static intel_engine_mask_t init_engine_mask(struct 
> intel_gt *gt)
>       if (GRAPHICS_VER(i915) < 11)
>               return info->engine_mask;
>  
> -     media_fuse = ~intel_uncore_read(uncore, GEN11_GT_VEBOX_VDBOX_DISABLE);
> +     /*
> +      * On newer platforms the fusing register is called 'enable' and has
> +      * enable semantics, while on older platforms it is called 'disable'
> +      * and bits have disable semantices.
> +      */
> +     media_fuse = intel_uncore_read(uncore, GEN11_GT_VEBOX_VDBOX_DISABLE);
> +     if (GRAPHICS_VER_FULL(i915) < IP_VER(12, 50))
> +             media_fuse = ~media_fuse;
>  
>       vdbox_mask = media_fuse & GEN11_GT_VDBOX_DISABLE_MASK;
>       vebox_mask = (media_fuse & GEN11_GT_VEBOX_DISABLE_MASK) >>
> -- 
> 2.25.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to