drm/amdgpu: move more defines into amdgpu_irq.h

Everything that isn't related to the IH ring.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 22 insertions, 3 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h
index 3375ad778edc..f6ce171cb8aa 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h
@@ -25,19 +25,38 @@
 #define __AMDGPU_IRQ_H__
 
 #include <linux/irqdomain.h>
+#include "soc15_ih_clientid.h"
 #include "amdgpu_ih.h"
 
-#define AMDGPU_MAX_IRQ_SRC_ID   0x100
+#define AMDGPU_MAX_IRQ_SRC_ID           0x100
 #define AMDGPU_MAX_IRQ_CLIENT_ID        0x100
 
+#define AMDGPU_IRQ_CLIENTID_LEGACY      0
+#define AMDGPU_IRQ_CLIENTID_MAX         SOC15_IH_CLIENTID_MAX
+
+#define AMDGPU_IRQ_SRC_DATA_MAX_SIZE_DW 4
+
 struct amdgpu_device;
-struct amdgpu_iv_entry;
 
 enum amdgpu_interrupt_state {
         AMDGPU_IRQ_STATE_DISABLE,
         AMDGPU_IRQ_STATE_ENABLE,
 };
 
+struct amdgpu_iv_entry {
+        unsigned client_id;
+        unsigned src_id;
+        unsigned ring_id;
+        unsigned vmid;
+        unsigned vmid_src;
+        uint64_t timestamp;
+        unsigned timestamp_src;
+        unsigned pasid;
+        unsigned pasid_src;
+        unsigned src_data[AMDGPU_IRQ_SRC_DATA_MAX_SIZE_DW];
+        const uint32_t *iv_entry;
+};
+
 struct amdgpu_irq_src {
         unsigned                                num_types;
         atomic_t                                *enabled_types;
@@ -63,7 +82,7 @@ struct amdgpu_irq {
         bool                            installed;
         spinlock_t                      lock;
         /* interrupt sources */
-        struct amdgpu_irq_client        client[AMDGPU_IH_CLIENTID_MAX];
+        struct amdgpu_irq_client        client[AMDGPU_IRQ_CLIENTID_MAX];
 
         /* status, etc. */
         bool                            msi_enabled; /* msi enabled */