mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 18:41:58 +09:00
drm/i915: Don't set PIPE_CONTROL_FLUSH_L3 for aux inval
[ Upstream commit128c20eda7] PIPE_CONTROL_FLUSH_L3 is not needed for aux invalidation so don't set that. Fixes:78a6ccd65f("drm/i915/gt: Ensure memory quiesced before invalidation") Cc: Jonathan Cavitt <jonathan.cavitt@intel.com> Cc: Andi Shyti <andi.shyti@linux.intel.com> Cc: <stable@vger.kernel.org> # v5.8+ Cc: Andrzej Hajda <andrzej.hajda@intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Matt Roper <matthew.d.roper@intel.com> Cc: Tejas Upadhyay <tejas.upadhyay@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Cc: Prathap Kumar Valsan <prathap.kumar.valsan@intel.com> Cc: Tapani Pälli <tapani.palli@intel.com> Cc: Mark Janes <mark.janes@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com> Acked-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Tested-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230926142401.25687-1-nirmoy.das@intel.com (cherry picked from commit 03d681412b38558aefe4fb0f46e36efa94bb21ef) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
f2060a3a59
commit
f175665385
@@ -235,8 +235,17 @@ int gen12_emit_flush_rcs(struct i915_request *rq, u32 mode)
|
|||||||
u32 flags = 0;
|
u32 flags = 0;
|
||||||
u32 *cs;
|
u32 *cs;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* L3 fabric flush is needed for AUX CCS invalidation
|
||||||
|
* which happens as part of pipe-control so we can
|
||||||
|
* ignore PIPE_CONTROL_FLUSH_L3. Also PIPE_CONTROL_FLUSH_L3
|
||||||
|
* deals with Protected Memory which is not needed for
|
||||||
|
* AUX CCS invalidation and lead to unwanted side effects.
|
||||||
|
*/
|
||||||
|
if (mode & EMIT_FLUSH)
|
||||||
|
flags |= PIPE_CONTROL_FLUSH_L3;
|
||||||
|
|
||||||
flags |= PIPE_CONTROL_TILE_CACHE_FLUSH;
|
flags |= PIPE_CONTROL_TILE_CACHE_FLUSH;
|
||||||
flags |= PIPE_CONTROL_FLUSH_L3;
|
|
||||||
flags |= PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH;
|
flags |= PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH;
|
||||||
flags |= PIPE_CONTROL_DEPTH_CACHE_FLUSH;
|
flags |= PIPE_CONTROL_DEPTH_CACHE_FLUSH;
|
||||||
/* Wa_1409600907:tgl,adl-p */
|
/* Wa_1409600907:tgl,adl-p */
|
||||||
|
|||||||
Reference in New Issue
Block a user