drm/amdkfd: Don't include header files from radeon

Because amdkfd will need to work both with radeon and amdgpu, don't include
header files that are in radeon's folder.

Instead, use the common amd include folder and move amdkfd specific defines to
amdkfd header files.

Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/cik_regs.h b/drivers/gpu/drm/amd/amdkfd/cik_regs.h
index 607fc5c..01ff332 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/cik_regs.h
+++ b/drivers/gpu/drm/amd/amdkfd/cik_regs.h
@@ -168,6 +168,8 @@
 #define        IB_ATC_EN                                       (1U << 23)
 #define        DEFAULT_MIN_IB_AVAIL_SIZE                       (3U << 20)
 
+#define        AQL_ENABLE                                      1
+
 #define CP_HQD_DEQUEUE_REQUEST                         0xC974
 #define        DEQUEUE_REQUEST_DRAIN                           1
 #define DEQUEUE_REQUEST_RESET                          2
@@ -188,6 +190,17 @@
 #define        MQD_VMID_MASK                                   (0xf << 0)
 #define        MQD_CONTROL_PRIV_STATE_EN                       (1U << 8)
 
+#define        SDMA_RB_VMID(x)                                 (x << 24)
+#define        SDMA_RB_ENABLE                                  (1 << 0)
+#define        SDMA_RB_SIZE(x)                                 ((x) << 1) /* log2 */
+#define        SDMA_RPTR_WRITEBACK_ENABLE                      (1 << 12)
+#define        SDMA_RPTR_WRITEBACK_TIMER(x)                    ((x) << 16) /* log2 */
+#define        SDMA_OFFSET(x)                                  (x << 0)
+#define        SDMA_DB_ENABLE                                  (1 << 28)
+#define        SDMA_ATC                                        (1 << 0)
+#define        SDMA_VA_PTR32                                   (1 << 4)
+#define        SDMA_VA_SHARED_BASE(x)                          (x << 8)
+
 #define GRBM_GFX_INDEX                                 0x30800
 #define        INSTANCE_INDEX(x)                               ((x) << 0)
 #define        SH_INDEX(x)                                     ((x) << 8)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index 60f4ccb..fead2d7 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -31,7 +31,6 @@
 #include "kfd_mqd_manager.h"
 #include "cik_regs.h"
 #include "kfd_kernel_queue.h"
-#include "../../radeon/cik_reg.h"
 
 /* Size of the per-pipe EOP queue */
 #define CIK_HPD_EOP_BYTES_LOG2 11

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
index 678c33f..155e33c 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
@@ -26,8 +26,7 @@
 #include "kfd_priv.h"
 #include "kfd_mqd_manager.h"
 #include "cik_regs.h"
-#include "../../radeon/cikd.h"
-#include "../../radeon/cik_reg.h"
+#include "cik_structs.h"
 
 inline void busy_wait(unsigned long ms)
 {