drm/amdgpu: add initial vcn support and decode tests

VCN is the new media block on Raven. Add core support
and the ring and ib tests for decode.

Signed-off-by: Leo Liu <leo.liu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 36 insertions, 4 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index a2dd218e35b9..68817e60e787 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1181,6 +1181,31 @@ void amdgpu_wb_free_64bit(struct amdgpu_device *adev, u32 wb);
 void amdgpu_get_pcie_info(struct amdgpu_device *adev);
 
 /*
+ * VCN
+ */
+#define AMDGPU_VCN_STACK_SIZE           (200*1024)
+#define AMDGPU_VCN_HEAP_SIZE            (256*1024)
+#define AMDGPU_VCN_SESSION_SIZE         (50*1024)
+#define AMDGPU_VCN_FIRMWARE_OFFSET      256
+#define AMDGPU_VCN_MAX_ENC_RINGS        3
+
+struct amdgpu_vcn {
+        struct amdgpu_bo        *vcpu_bo;
+        void                    *cpu_addr;
+        uint64_t                gpu_addr;
+        unsigned                fw_version;
+        void                    *saved_bo;
+        struct delayed_work     idle_work;
+        const struct firmware   *fw;    /* VCN firmware */
+        struct amdgpu_ring      ring_dec;
+        struct amdgpu_ring      ring_enc[AMDGPU_VCN_MAX_ENC_RINGS];
+        struct amdgpu_irq_src   irq;
+        struct amd_sched_entity entity_dec;
+        struct amd_sched_entity entity_enc;
+        uint32_t                srbm_soft_reset;
+};
+
+/*
  * SDMA
  */
 struct amdgpu_sdma_instance {
@@ -1572,11 +1597,18 @@ struct amdgpu_device {
         /* sdma */
         struct amdgpu_sdma              sdma;
 
-        /* uvd */
-        struct amdgpu_uvd               uvd;
+        union {
+                struct {
+                        /* uvd */
+                        struct amdgpu_uvd               uvd;
+
+                        /* vce */
+                        struct amdgpu_vce               vce;
+                };
 
-        /* vce */
-        struct amdgpu_vce               vce;
+                /* vcn */
+                struct amdgpu_vcn               vcn;
+        };
 
         /* firmwares */
         struct amdgpu_firmware          firmware;