From 1fee035bee8d99436cde73b5727c8a19ac9534b6 Mon Sep 17 00:00:00 2001 From: Hawking Zhang Date: Sun, 16 Mar 2025 19:04:51 +0800 Subject: [PATCH] drm/amdgpu: Include the correct pkt header for gfx v12_1 GFX v12_1 should use packets defined in gfx_v12_1_pkt header file. Signed-off-by: Hawking Zhang Reviewed-by: Likun Gao Acked-by: Feifei Xu Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 1 - drivers/gpu/drm/amd/amdgpu/gfx_v12_1_pkt.h | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c index 8d281fb54b6b..b2702287536f 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c @@ -40,7 +40,6 @@ #include "ivsrcid/gfx/irqsrcs_gfx_11_0_0.h" #include "soc15.h" -#include "soc15d.h" #include "clearstate_gfx12.h" #include "v12_structs.h" #include "gfx_v12_1.h" diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1_pkt.h b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1_pkt.h index f58ce882f2ae..9a5c82c8db53 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1_pkt.h +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1_pkt.h @@ -369,9 +369,11 @@ #define PACKET3_HDP_FLUSH 0x95 #define PACKET3_COPY_DATA_RB 0x96 #define PACKET3_INVALIDATE_TLBS 0x98 -# define PACKET3_INVALIDATE_TLBS_DST_SEL(x) ((x) << 0) -# define PACKET3_INVALIDATE_TLBS_ALL_HUB(x) ((x) << 4) -# define PACKET3_INVALIDATE_TLBS_PASID(x) ((x) << 5) +#define PACKET3_INVALIDATE_TLBS_DST_SEL(x) ((x) << 0) +#define PACKET3_INVALIDATE_TLBS_ALL_HUB(x) ((x) << 4) +#define PACKET3_INVALIDATE_TLBS_PASID(x) ((x) << 5) +#define PACKET3_INVALIDATE_TLBS_FLUSH_TYPE(x) ((x) << 29) + #define PACKET3_AQL_PACKET 0x99 #define PACKET3_DMA_DATA_FILL_MULTI 0x9A #define PACKET3_SET_SH_REG_INDEX 0x9B -- 2.47.3