Skip to content

Commit 7d7a328

Browse files
nirmoyjnikula
authored andcommitted
drm/i915: Flush WC GGTT only on required platforms
gen8_ggtt_invalidate() is only needed for limited set of platforms where GGTT is mapped as WC. This was added as way to fix WC based GGTT in commit 0f9b91c ("drm/i915: flush system agent TLBs on SNB") and there are no reference in HW docs that forces us to use this on non-WC backed GGTT. This can also cause unwanted side-effects on XE_HP platforms where GFX_FLSH_CNTL_GEN6 is not valid anymore. v2: Add a func to detect wc ggtt detection (Ville) v3: Improve commit log and add reference commit (Daniel) Fixes: d2eae8e ("drm/i915/dg2: Drop force_probe requirement") Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Jonathan Cavitt <jonathan.cavitt@intel.com> Cc: John Harrison <john.c.harrison@intel.com> Cc: Andi Shyti <andi.shyti@linux.intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: <stable@vger.kernel.org> # v6.2+ Suggested-by: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231018093815.1349-1-nirmoy.das@intel.com (cherry picked from commit 81de3e2) Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1 parent 390001d commit 7d7a328

File tree

1 file changed

+24
-11
lines changed

1 file changed

+24
-11
lines changed

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

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,34 @@ void gen6_ggtt_invalidate(struct i915_ggtt *ggtt)
195195
spin_unlock_irq(&uncore->lock);
196196
}
197197

198+
static bool needs_wc_ggtt_mapping(struct drm_i915_private *i915)
199+
{
200+
/*
201+
* On BXT+/ICL+ writes larger than 64 bit to the GTT pagetable range
202+
* will be dropped. For WC mappings in general we have 64 byte burst
203+
* writes when the WC buffer is flushed, so we can't use it, but have to
204+
* resort to an uncached mapping. The WC issue is easily caught by the
205+
* readback check when writing GTT PTE entries.
206+
*/
207+
if (!IS_GEN9_LP(i915) && GRAPHICS_VER(i915) < 11)
208+
return true;
209+
210+
return false;
211+
}
212+
198213
static void gen8_ggtt_invalidate(struct i915_ggtt *ggtt)
199214
{
200215
struct intel_uncore *uncore = ggtt->vm.gt->uncore;
201216

202217
/*
203218
* Note that as an uncached mmio write, this will flush the
204219
* WCB of the writes into the GGTT before it triggers the invalidate.
220+
*
221+
* Only perform this when GGTT is mapped as WC, see ggtt_probe_common().
205222
*/
206-
intel_uncore_write_fw(uncore, GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN);
223+
if (needs_wc_ggtt_mapping(ggtt->vm.i915))
224+
intel_uncore_write_fw(uncore, GFX_FLSH_CNTL_GEN6,
225+
GFX_FLSH_CNTL_EN);
207226
}
208227

209228
static void guc_ggtt_ct_invalidate(struct intel_gt *gt)
@@ -1140,17 +1159,11 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
11401159
GEM_WARN_ON(pci_resource_len(pdev, GEN4_GTTMMADR_BAR) != gen6_gttmmadr_size(i915));
11411160
phys_addr = pci_resource_start(pdev, GEN4_GTTMMADR_BAR) + gen6_gttadr_offset(i915);
11421161

1143-
/*
1144-
* On BXT+/ICL+ writes larger than 64 bit to the GTT pagetable range
1145-
* will be dropped. For WC mappings in general we have 64 byte burst
1146-
* writes when the WC buffer is flushed, so we can't use it, but have to
1147-
* resort to an uncached mapping. The WC issue is easily caught by the
1148-
* readback check when writing GTT PTE entries.
1149-
*/
1150-
if (IS_GEN9_LP(i915) || GRAPHICS_VER(i915) >= 11)
1151-
ggtt->gsm = ioremap(phys_addr, size);
1152-
else
1162+
if (needs_wc_ggtt_mapping(i915))
11531163
ggtt->gsm = ioremap_wc(phys_addr, size);
1164+
else
1165+
ggtt->gsm = ioremap(phys_addr, size);
1166+
11541167
if (!ggtt->gsm) {
11551168
drm_err(&i915->drm, "Failed to map the ggtt page table\n");
11561169
return -ENOMEM;

0 commit comments

Comments
 (0)