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 <Hawking.Zhang@amd.com>
Reviewed-by: Likun Gao <Likun.Gao@amd.com>
Acked-by: Feifei Xu <Feifei.Xu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
index 8d281fb54b6b8b569afc66f88d8e18d16b503285..b2702287536f5dc7e6a3330fb8f32f58e437e89c 100644 (file)
--- 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 f58ce882f2ae39ebc403b26a199b3f3501577998..9a5c82c8db53b7b43eb20006642a05ca9d372ac2 100644 (file)
--- 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