Skip to content

Commit 78a6ccd

Browse files
Jonathan-Cavitttursulin
authored andcommitted
drm/i915/gt: Ensure memory quiesced before invalidation
All memory traffic must be quiesced before requesting an aux invalidation on platforms that use Aux CCS. Fixes: 972282c ("drm/i915/gen12: Add aux table invalidate for all engines") Requires: a2a4aa0eef3b ("drm/i915: Add the gen12_needs_ccs_aux_inv helper") Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> Cc: <stable@vger.kernel.org> # v5.8+ Reviewed-by: Nirmoy Das <nirmoy.das@intel.com> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230725001950.1014671-4-andi.shyti@linux.intel.com (cherry picked from commit ad8ebf1) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
1 parent b2f59e9 commit 78a6ccd

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,11 @@ int gen12_emit_flush_rcs(struct i915_request *rq, u32 mode)
214214
{
215215
struct intel_engine_cs *engine = rq->engine;
216216

217-
if (mode & EMIT_FLUSH) {
217+
/*
218+
* On Aux CCS platforms the invalidation of the Aux
219+
* table requires quiescing memory traffic beforehand
220+
*/
221+
if (mode & EMIT_FLUSH || gen12_needs_ccs_aux_inv(engine)) {
218222
u32 flags = 0;
219223
int err;
220224
u32 *cs;

0 commit comments

Comments
 (0)