drm/xe: Reinstate render / compute cache invalidation in ring ops
Subsystems (2)
Matthew Brost
maintainerPATCH 1/1 drm/xe: Reinstate render / compute cache invalidation in ring ops
Render / compute engines have additional caches (not just TLBs) that need to be invalidated each batch, reinstate these invalidations in ring ops.
--- drivers/gpu/drm/xe/regs/xe_gpu_commands.h | 5 ++++ drivers/gpu/drm/xe/xe_ring_ops.c | 30 +++++++++++++++++++++++ 2 files changed, 35 insertions(+)
drivers/gpu/drm/xe/regs/xe_gpu_commands.h +5 -0
@@ -57,20 +57,25 @@#define BLT_DEPTH_32 (3<<24)#define GFX_OP_PIPE_CONTROL (len) ((0x3<<29)|(0x3<<27)|(0x2<<24)|((len)-2)) +#define PIPE_CONTROL_COMMAND_CACHE_INVALIDATE (1<<29)#define PIPE_CONTROL_TILE_CACHE_FLUSH (1<<28)#define PIPE_CONTROL_AMFS_FLUSH (1<<25)#define PIPE_CONTROL_GLOBAL_GTT_IVB (1<<24) +#define PIPE_CONTROL_STORE_DATA_INDEX (1<<21)#define PIPE_CONTROL_CS_STALL (1<<20)#define PIPE_CONTROL_GLOBAL_SNAPSHOT_RESET (1<<19)#define PIPE_CONTROL_PSD_SYNC (1<<17)#define PIPE_CONTROL_QW_WRITE (1<<14)#define PIPE_CONTROL_DEPTH_STALL (1<<13)#define PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH (1<<12) +#define PIPE_CONTROL_INSTRUCTION_CACHE_INVALIDATE (1<<11)#define PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE (1<<10)#define PIPE_CONTROL_INDIRECT_STATE_DISABLE (1<<9)#define PIPE_CONTROL_FLUSH_ENABLE (1<<7)#define PIPE_CONTROL_DC_FLUSH_ENABLE (1<<5)#define PIPE_CONTROL_VF_CACHE_INVALIDATE (1<<4) +#define PIPE_CONTROL_CONST_CACHE_INVALIDATE (1<<3) +#define PIPE_CONTROL_STATE_CACHE_INVALIDATE (1<<2)#define PIPE_CONTROL_STALL_AT_SCOREBOARD (1<<1)#define PIPE_CONTROL_DEPTH_CACHE_FLUSH (1<<0)
drivers/gpu/drm/xe/xe_ring_ops.c +30 -0
@@ -106,6 +106,30 @@ static int emit_flush_invalidate(u32 flag, u32 *dw, int i)return i; } +static int emit_pipe_invalidate (u32 mask_flags,u32 *dw,int i) +{ +u32 flags =PIPE_CONTROL_CS_STALL | +PIPE_CONTROL_COMMAND_CACHE_INVALIDATE | +PIPE_CONTROL_INSTRUCTION_CACHE_INVALIDATE | +PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE | +PIPE_CONTROL_VF_CACHE_INVALIDATE | +PIPE_CONTROL_CONST_CACHE_INVALIDATE | +PIPE_CONTROL_STATE_CACHE_INVALIDATE | +PIPE_CONTROL_QW_WRITE | +PIPE_CONTROL_STORE_DATA_INDEX ; + + flags &= ~mask_flags; + + dw[i++] =GFX_OP_PIPE_CONTROL (6 ); + dw[i++] = flags; + dw[i++] =LRC_PPHWSP_SCRATCH_ADDR ; + dw[i++] =0 ; + dw[i++] =0 ; + dw[i++] =0 ; + +return i; +} +#define MI_STORE_QWORD_IMM_GEN8_POSTED (MI_INSTR(0x20, 3) | (1 << 21)) static int emit_store_imm_ppgtt_posted(u64 addr, u64 value,
@@ -212,8 +236,14 @@ static void __emit_job_gen12_render_compute(struct xe_sched_job *job,struct xe_gt *gt = job->engine->gt;struct xe_device *xe =gt_to_xe (gt);bool pvc = xe->info.platform ==XE_PVC ; +u32 mask_flags =0 ; dw[i++] =preparser_disable (true); +if (pvc) + mask_flags =PIPE_CONTROL_3D_ARCH_FLAGS ; +else if (job->engine->class ==XE_ENGINE_CLASS_COMPUTE ) + mask_flags =PIPE_CONTROL_3D_ENGINE_FLAGS ; + i =emit_pipe_invalidate (mask_flags, dw, i);/* Wa_1809175790 */ if (!xe->info.has_flat_ccs) i =emit_aux_table_inv (gt,GEN12_GFX_CCS_AUX_NV .reg, dw, i);
Signature · 1 line
2.34.1
[Intel-xe] ✗ CI.Patch_applied: failure for drm/xe: Reinstate render / compute cache invalidation in ring ops
== Series Details ==
== Series Details ==
Series: drm/xe: Reinstate render / compute cache invalidation in ring ops
URL : https://patchwork.freedesktop.org/series/115472/
State : failure
== Summary ==
=== Applying kernel patches on branch 'drm-xe-next' with base: === commit 1ae4dd9e82429e075aa7121404b06ce170da5848
Author: Matthew Auld <[email protected]> AuthorDate: Tue Mar 21 11:44:07 2023 +0000 Commit: Matthew Auld <[email protected]> CommitDate: Tue Mar 21 14:03:29 2023 +0000
drm/xe/buddy: add compatible and intersects hooks
Copy this from i915. We need .compatible for vram -> vram transfers, so they don't just get nooped by ttm, if need to move something from mappable to non-mappble or vice versa. The .intersects is needed for eviction, to determine if a victim resource is worth eviction. e.g if we need mappable space there is no point in evicting a resource that has zero mappable pages.
=== git am output follows ===
error: patch failed: drivers/gpu/drm/xe/regs/xe_gpu_commands.h:57
error: drivers/gpu/drm/xe/regs/xe_gpu_commands.h: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: drm/xe: Reinstate render / compute cache invalidation in ring ops Patch failed at 0001 drm/xe: Reinstate render / compute cache invalidation in ring ops When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".