Re: [Intel-gfx] [PATCH 1/2] Revert "drm/i915/mtl: fix mocs selftest"

[Andrzej Hajda <andrzej.hajda@intel.com>]

On 24.04.2023 18:09, Andi Shyti wrote:
> This reverts commit faca6aaa4838c3c234caa619d3c7d1f09da0d303.
> 
> This patch, in series with the next "Define MOCS and PAT tables
> for MTL" are causing boot failures for MTL.
> 
> Revert them both.
> 
> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
> Cc: Fei Yang <fei.yang@intel.com>
> Cc: Matt Roper <matthew.d.roper@intel.com>

Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>

Regards
Andrzej
> ---
>   drivers/gpu/drm/i915/gt/selftest_mocs.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/selftest_mocs.c b/drivers/gpu/drm/i915/gt/selftest_mocs.c
> index a8446ab825012..ca009a6a13bdb 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_mocs.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_mocs.c
> @@ -131,14 +131,13 @@ static int read_mocs_table(struct i915_request *rq,
>   			   const struct drm_i915_mocs_table *table,
>   			   u32 *offset)
>   {
> -	struct intel_gt *gt = rq->engine->gt;
>   	u32 addr;
>   
>   	if (!table)
>   		return 0;
>   
>   	if (HAS_GLOBAL_MOCS_REGISTERS(rq->engine->i915))
> -		addr = global_mocs_offset() + gt->uncore->gsi_offset;
> +		addr = global_mocs_offset();
>   	else
>   		addr = mocs_offset(rq->engine);
>