Skip to content

Commit 5fde104

Browse files
vsbelgaumAndi Shyti
authored andcommitted
drm/i915/mtl: Don't set PIPE_CONTROL_FLUSH_L3
This bit does not cause an explicit L3 flush. We already use PIPE_CONTROL_DC_FLUSH_ENABLE for that purpose. v2: Use FLUSH_L3 only pre-MTL since spec will likely remain the same going forward. Cc: Nirmoy Das <[email protected]> Cc: Mika Kuoppala <[email protected]> Acked-by: Mika Kuoppala <[email protected]> Reviewed-by: Nirmoy Das <[email protected]> Signed-off-by: Vinay Belgaumkar <[email protected]> Reviewed-by: Andi Shyti <[email protected]> Signed-off-by: Andi Shyti <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent f1cdb59 commit 5fde104

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,8 @@ int gen12_emit_flush_rcs(struct i915_request *rq, u32 mode)
278278
* deals with Protected Memory which is not needed for
279279
* AUX CCS invalidation and lead to unwanted side effects.
280280
*/
281-
if (mode & EMIT_FLUSH)
281+
if ((mode & EMIT_FLUSH) &&
282+
GRAPHICS_VER_FULL(rq->i915) < IP_VER(12, 70))
282283
bit_group_1 |= PIPE_CONTROL_FLUSH_L3;
283284

284285
bit_group_1 |= PIPE_CONTROL_TILE_CACHE_FLUSH;
@@ -812,12 +813,14 @@ u32 *gen12_emit_fini_breadcrumb_rcs(struct i915_request *rq, u32 *cs)
812813
u32 flags = (PIPE_CONTROL_CS_STALL |
813814
PIPE_CONTROL_TLB_INVALIDATE |
814815
PIPE_CONTROL_TILE_CACHE_FLUSH |
815-
PIPE_CONTROL_FLUSH_L3 |
816816
PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH |
817817
PIPE_CONTROL_DEPTH_CACHE_FLUSH |
818818
PIPE_CONTROL_DC_FLUSH_ENABLE |
819819
PIPE_CONTROL_FLUSH_ENABLE);
820820

821+
if (GRAPHICS_VER_FULL(rq->i915) < IP_VER(12, 70))
822+
flags |= PIPE_CONTROL_FLUSH_L3;
823+
821824
/* Wa_14016712196 */
822825
if (IS_GFX_GT_IP_RANGE(gt, IP_VER(12, 70), IP_VER(12, 71)) || IS_DG2(i915))
823826
/* dummy PIPE_CONTROL + depth flush */

0 commit comments

Comments
 (0)