Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[cascardo/linux.git] / drivers / gpu / drm / amd / amdgpu / cikd.h

diff --git a/drivers/gpu/drm/amd/amdgpu/cikd.h b/drivers/gpu/drm/amd/amdgpu/cikd.h
index d19085a..7f6d457 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/cikd.h
+++ b/drivers/gpu/drm/amd/amdgpu/cikd.h
@@ -487,6 +487,7 @@
                                         (((op) & 0xFF) << 0))
 /* sDMA opcodes */
 #define        SDMA_OPCODE_NOP                                   0
+#      define SDMA_NOP_COUNT(x)                          (((x) & 0x3FFF) << 16)
 #define        SDMA_OPCODE_COPY                                  1
 #       define SDMA_COPY_SUB_OPCODE_LINEAR                0
 #       define SDMA_COPY_SUB_OPCODE_TILED                 1
@@ -552,6 +553,12 @@
 #define VCE_CMD_IB_AUTO                0x00000005
 #define VCE_CMD_SEMAPHORE      0x00000006
 
+/* if PTR32, these are the bases for scratch and lds */
+#define        PRIVATE_BASE(x) ((x) << 0) /* scratch */
+#define        SHARED_BASE(x)  ((x) << 16) /* LDS */
+
+#define KFD_CIK_SDMA_QUEUE_OFFSET      0x200
+
 /* valid for both DEFAULT_MTYPE and APE1_MTYPE */
 enum {
        MTYPE_CACHED = 0,