Commit f1530f91 authored by Jonathan Cavitt's avatar Jonathan Cavitt Committed by Andi Shyti
Browse files

drm/i915/gt: Apply workaround 22016122933 correctly 



WA_22016122933 was recently applied to all MeteorLake engines, which is
simultaneously too broad (should only apply to Media engines) and too
specific (should apply to all platforms that use the same media engine
as MeteorLake).  Correct this in cases where coherency settings are
modified.

There were also two additional places where the workaround was applied
unconditionally.  The change was confirmed as necessary for all
platforms, so the workaround label was removed.

Suggested-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Acked-by: default avatarFei Yang <fei.yang@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230801153242.2445478-4-jonathan.cavitt@intel.com
Link: https://patchwork.freedesktop.org/patch/msgid/20230807121957.598420-4-andi.shyti@linux.intel.com
parent 115cdcca

drivers/gpu/drm/i915/gt/intel_gt.c

+3 −2
Original line number Diff line number Diff line
@@ -1009,9 +1009,10 @@ enum i915_map_type intel_gt_coherent_map_type(struct intel_gt *gt, 
					      bool always_coherent)

{

	/*

	 * Wa_22016122933: always return I915_MAP_WC for MTL

	 * Wa_22016122933: always return I915_MAP_WC for Media

	 * version 13.0 when the object is on the Media GT

	 */

	if (i915_gem_object_is_lmem(obj) || IS_METEORLAKE(gt->i915))

	if (i915_gem_object_is_lmem(obj) || intel_gt_needs_wa_22016122933(gt))

		return I915_MAP_WC;

	if (HAS_LLC(gt->i915) || always_coherent)

		return I915_MAP_WB;

drivers/gpu/drm/i915/gt/intel_gt.h

+6 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#ifndef __INTEL_GT__

#define __INTEL_GT__



#include "i915_drv.h"

#include "intel_engine_types.h"

#include "intel_gt_types.h"

#include "intel_reset.h"
@@ -24,6 +25,11 @@ static inline bool gt_is_root(struct intel_gt *gt) 
	return !gt->info.id;

}



static inline bool intel_gt_needs_wa_22016122933(struct intel_gt *gt)

{

	return MEDIA_VER_FULL(gt->i915) == IP_VER(13, 0) && gt->type == GT_MEDIA;

}



static inline struct intel_gt *uc_to_gt(struct intel_uc *uc)

{

	return container_of(uc, struct intel_gt, uc);

drivers/gpu/drm/i915/gt/intel_lrc.c

+4 −3
Original line number Diff line number Diff line
@@ -1095,10 +1095,11 @@ __lrc_alloc_state(struct intel_context *ce, struct intel_engine_cs *engine) 
	if (IS_ERR(obj)) {

		obj = i915_gem_object_create_shmem(engine->i915, context_size);

		/*

		 * Wa_22016122933: For MTL the shared memory needs to be mapped

		 * as WC on CPU side and UC (PAT index 2) on GPU side

		 * Wa_22016122933: For Media version 13.0, all Media GT shared

		 * memory needs to be mapped as WC on CPU side and UC (PAT

		 * index 2) on GPU side.

		 */

		if (IS_METEORLAKE(engine->i915))

		if (intel_gt_needs_wa_22016122933(engine->gt))

			i915_gem_object_set_cache_coherency(obj, I915_CACHE_NONE);

	}

	if (IS_ERR(obj))

drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c

+0 −4
Original line number Diff line number Diff line
@@ -298,10 +298,6 @@ static int gsc_fw_load_prepare(struct intel_gsc_uc *gsc) 
	memcpy_toio(gsc->local_vaddr, src, gsc->fw.size);

	memset_io(gsc->local_vaddr + gsc->fw.size, 0, gsc->local->size - gsc->fw.size);



	/*

	 * Wa_22016122933: Making sure the data in dst is

	 * visible to GSC right away

	 */

	intel_guc_write_barrier(&gt->uc.guc);



	i915_gem_object_unpin_map(gsc->fw.obj);

drivers/gpu/drm/i915/gt/uc/intel_guc.c

+4 −3
Original line number Diff line number Diff line
@@ -745,10 +745,11 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size) 
		return ERR_CAST(obj);



	/*

	 * Wa_22016122933: For MTL the shared memory needs to be mapped

	 * as WC on CPU side and UC (PAT index 2) on GPU side

	 * Wa_22016122933: For Media version 13.0, all Media GT shared

	 * memory needs to be mapped as WC on CPU side and UC (PAT

	 * index 2) on GPU side.

	 */

	if (IS_METEORLAKE(gt->i915))

	if (intel_gt_needs_wa_22016122933(gt))

		i915_gem_object_set_cache_coherency(obj, I915_CACHE_NONE);



	vma = i915_vma_instance(obj, &gt->ggtt->vm, NULL);