Skip to contentSkip to conversation

drm/xe: Remove PIPE_CONTROL_TILE_CACHE_FLUSH from PIPE_CONTROL in gfx20+

PATCH In review José Roberto de Souza 3 participants 5 messages Oct 6, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/xe: Remove PIPE_CONTROL_TILE_CACHE_FLUSH from PIPE_CONTROL in gfx20+

PIPE_CONTROL_TILE_CACHE_FLUSH/bit 28 is now reserved bit in PIPE_CONTROL instruction for gfx20+, so here only setting it for older graphics versions.

---
 drivers/gpu/drm/xe/xe_ring_ops.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_ring_ops.c +4 -1
index 6eec7c7e4bc56..c2aec32fc46ad 100644
@@ -157,16 +157,19 @@ static int emit_store_imm_ppgtt_posted(u64 addr, u64 value,
 static int emit_render_cache_flush(struct xe_sched_job *job, u32 *dw, int i)
 {
 	struct xe_gt *gt = job->q->gt;
+	struct xe_device *xe = gt->tile->xe;
 	bool lacks_render = !(gt->info.engine_mask & XE_HW_ENGINE_RCS_MASK);
 	u32 flags;
 
 	flags = (PIPE_CONTROL_CS_STALL |
-		 PIPE_CONTROL_TILE_CACHE_FLUSH |
 		 PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH |
 		 PIPE_CONTROL_DEPTH_CACHE_FLUSH |
 		 PIPE_CONTROL_DC_FLUSH_ENABLE |
 		 PIPE_CONTROL_FLUSH_ENABLE);
 
+	if (GRAPHICS_VERx100(xe) < 2000)
+		flags |= PIPE_CONTROL_TILE_CACHE_FLUSH;
+
 	if (XE_WA(gt, 1409600907))
 		flags |= PIPE_CONTROL_DEPTH_STALL;
 
Signature · 1 line
2.42.0
#1 lore raw
Quoted 15 lines · Jose Souza

PIPE_CONTROL_TILE_CACHE_FLUSH/bit 28 is now reserved bit in PIPE_CONTROL instruction for gfx20+, so here only setting it for older graphics versions.

---
drivers/gpu/drm/xe/xe_ring_ops.c | 5 ++++-

1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_ring_ops.c +0 -0
index 6eec7c7e4bc56..c2aec32fc46ad 100644

drivers/gpu/drm/xe/xe_ring_ops.c static int emit_store_imm_ppgtt_posted(u64 addr, u64 value, · line 160

Quoted 4 lines
drivers/gpu/drm/xe/xe_ring_ops.c +1 -0
@@ -157,16 +157,19 @@ static int emit_store_imm_ppgtt_posted(u64 addr, u64 value,
 static int emit_render_cache_flush(struct xe_sched_job *job, u32 *dw, int i)
 {
 	struct xe_gt *gt = job->q->gt;
+	struct xe_device *xe = gt->tile->xe;

gt_to_xe()

drivers/gpu/drm/xe/xe_ring_ops.c static int emit_store_imm_ppgtt_posted(u64 addr, u64 value, · line 171

Quoted 12 lines
drivers/gpu/drm/xe/xe_ring_ops.c +2 -1
 	bool lacks_render = !(gt->info.engine_mask & XE_HW_ENGINE_RCS_MASK);
 	u32 flags;
 
 	flags = (PIPE_CONTROL_CS_STALL |
-		 PIPE_CONTROL_TILE_CACHE_FLUSH |
 		 PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH |
 		 PIPE_CONTROL_DEPTH_CACHE_FLUSH |
 		 PIPE_CONTROL_DC_FLUSH_ENABLE |
 		 PIPE_CONTROL_FLUSH_ENABLE);
 
+	if (GRAPHICS_VERx100(xe) < 2000)
+		flags |= PIPE_CONTROL_TILE_CACHE_FLUSH;

Looks correct that it doesn't exist in xe2. But looking at bspec 56551, it doesn't seem it can't be set, but rather that it doesn't have any effect on xe2. Is this not the case?

Lucas De Marchi

Quoted 7 lines
drivers/gpu/drm/xe/xe_ring_ops.c +1 -0
+
 	if (XE_WA(gt, 1409600907))
 		flags |= PIPE_CONTROL_DEPTH_STALL;
 
Signature · 1 line
2.42.0
#2 lore raw
Quoted 33 lines · Lucas De Marchi
Quoted 15 lines · Jose Souza

PIPE_CONTROL_TILE_CACHE_FLUSH/bit 28 is now reserved bit in PIPE_CONTROL instruction for gfx20+, so here only setting it for older graphics versions.

---
drivers/gpu/drm/xe/xe_ring_ops.c | 5 ++++-

1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_ring_ops.c +0 -0
index 6eec7c7e4bc56..c2aec32fc46ad 100644

drivers/gpu/drm/xe/xe_ring_ops.c static int emit_store_imm_ppgtt_posted(u64 addr, u64 value, · line 160

Quoted 4 lines
drivers/gpu/drm/xe/xe_ring_ops.c +1 -0
@@ -157,16 +157,19 @@ static int emit_store_imm_ppgtt_posted(u64 addr, u64 value,
 static int emit_render_cache_flush(struct xe_sched_job *job, u32 *dw, int i)
 {
 	struct xe_gt *gt = job->q->gt;
+	struct xe_device *xe = gt->tile->xe;

gt_to_xe()

Quoted 10 lines
drivers/gpu/drm/xe/xe_ring_ops.c +0 -1
 	bool lacks_render = !(gt->info.engine_mask & XE_HW_ENGINE_RCS_MASK);
 	u32 flags;
 
 	flags = (PIPE_CONTROL_CS_STALL |
-		 PIPE_CONTROL_TILE_CACHE_FLUSH |
 		 PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH |
 		 PIPE_CONTROL_DEPTH_CACHE_FLUSH |
 		 PIPE_CONTROL_DC_FLUSH_ENABLE |
 		 PIPE_CONTROL_FLUSH_ENABLE);
 
Quoted 6 lines

drivers/gpu/drm/xe/xe_ring_ops.c static int emit_store_imm_ppgtt_posted(u64 addr, u64 value, · line 171

Quoted 2 lines
drivers/gpu/drm/xe/xe_ring_ops.c +2 -0
+	if (GRAPHICS_VERx100(xe) < 2000)
+		flags |= PIPE_CONTROL_TILE_CACHE_FLUSH;

Looks correct that it doesn't exist in xe2. But looking at bspec 56551, it doesn't seem it can't be set, but rather that it doesn't have any effect on xe2. Is this not the case?

Yeah I don't see any tests failing because this bit is set in Xe or Mesa but better not set reserved bits.

Quoted 10 lines

Lucas De Marchi

Quoted 7 lines
drivers/gpu/drm/xe/xe_ring_ops.c +1 -0
+
 	if (XE_WA(gt, 1409600907))
 		flags |= PIPE_CONTROL_DEPTH_STALL;
 
Signature · 1 line
2.42.0
#3 lore raw
Quoted 34 lines · Jose Souza
Quoted 33 lines · Lucas De Marchi
Quoted 15 lines · Jose Souza

PIPE_CONTROL_TILE_CACHE_FLUSH/bit 28 is now reserved bit in PIPE_CONTROL instruction for gfx20+, so here only setting it for older graphics versions.

---
drivers/gpu/drm/xe/xe_ring_ops.c | 5 ++++-

1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_ring_ops.c +0 -0
index 6eec7c7e4bc56..c2aec32fc46ad 100644

drivers/gpu/drm/xe/xe_ring_ops.c static int emit_store_imm_ppgtt_posted(u64 addr, u64 value, · line 160

Quoted 4 lines
drivers/gpu/drm/xe/xe_ring_ops.c +1 -0
@@ -157,16 +157,19 @@ static int emit_store_imm_ppgtt_posted(u64 addr, u64 value,
 static int emit_render_cache_flush(struct xe_sched_job *job, u32 *dw, int i)
 {
 	struct xe_gt *gt = job->q->gt;
+	struct xe_device *xe = gt->tile->xe;

gt_to_xe()

Quoted 10 lines
drivers/gpu/drm/xe/xe_ring_ops.c +0 -1
 	bool lacks_render = !(gt->info.engine_mask & XE_HW_ENGINE_RCS_MASK);
 	u32 flags;
 
 	flags = (PIPE_CONTROL_CS_STALL |
-		 PIPE_CONTROL_TILE_CACHE_FLUSH |
 		 PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH |
 		 PIPE_CONTROL_DEPTH_CACHE_FLUSH |
 		 PIPE_CONTROL_DC_FLUSH_ENABLE |
 		 PIPE_CONTROL_FLUSH_ENABLE);
 
Quoted 8 lines
Quoted 6 lines

drivers/gpu/drm/xe/xe_ring_ops.c static int emit_store_imm_ppgtt_posted(u64 addr, u64 value, · line 171

Quoted 2 lines
drivers/gpu/drm/xe/xe_ring_ops.c +2 -0
+	if (GRAPHICS_VERx100(xe) < 2000)
+		flags |= PIPE_CONTROL_TILE_CACHE_FLUSH;

Looks correct that it doesn't exist in xe2. But looking at bspec 56551, it doesn't seem it can't be set, but rather that it doesn't have any effect on xe2. Is this not the case?

Yeah I don't see any tests failing because this bit is set in Xe or Mesa but better not set reserved bits.

Why better? We do that all the time in the driver when the bit is just "not valid for the platform" rather than "can't be set". When it's explicitely marked as reserved then it's a case by case analysis.

Lucas De Marchi

Quoted 12 lines
Quoted 11 lines

Lucas De Marchi

Quoted 7 lines
drivers/gpu/drm/xe/xe_ring_ops.c +1 -1
+
 	if (XE_WA(gt, 1409600907))
 		flags |= PIPE_CONTROL_DEPTH_STALL;
 
--

2.42.0

#4 lore raw

[Intel-xe] ✗ CI.Patch_applied: failure for drm/xe: Remove PIPE_CONTROL_TILE_CACHE_FLUSH from PIPE_CONTROL in gfx20+

In reply to José Roberto de Souza
== Series Details ==

== Series Details ==

Series: drm/xe: Remove PIPE_CONTROL_TILE_CACHE_FLUSH from PIPE_CONTROL in gfx20+
URL : https://patchwork.freedesktop.org/series/124739/
State : failure

== Summary ==

=== Applying kernel patches on branch 'drm-xe-next' with base: === Base commit: f1b61d7d4 drm/xe: add gt tuning for indirect state
=== git am output follows ===
Applying: drm/xe: Remove PIPE_CONTROL_TILE_CACHE_FLUSH from PIPE_CONTROL in gfx20+