]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu: add VCN2.5 MMSCH start for Arcturus
authorJane Jian <Jane.Jian@amd.com>
Mon, 16 Dec 2019 06:14:49 +0000 (14:14 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 18 Dec 2019 21:33:26 +0000 (16:33 -0500)
Use MMSCH to do the initialization since MMSCH
manages VCN2.5 instances and its world switch.

Signed-off-by: Jane Jian <Jane.Jian@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/mmsch_v1_0.h
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c

index 8af0bddf85e4b06e89a7200a8592d10c916360ba..20958639b601b6bf65c51156a9df308410bc36fb 100644 (file)
@@ -47,6 +47,18 @@ struct mmsch_v1_0_init_header {
        uint32_t uvd_table_size;
 };
 
+struct mmsch_vf_eng_init_header {
+       uint32_t init_status;
+       uint32_t table_offset;
+       uint32_t table_size;
+};
+
+struct mmsch_v1_1_init_header {
+       uint32_t version;
+       uint32_t total_size;
+       struct mmsch_vf_eng_init_header eng[2];
+};
+
 struct mmsch_v1_0_cmd_direct_reg_header {
        uint32_t reg_offset   : 28;
        uint32_t command_type : 4;
index f67fca38c1a9f68bf1e81a42bc2b37298b99062a..cb134400d078139d462f1bd374f313443094a2ce 100644 (file)
@@ -29,6 +29,7 @@
 #include "soc15.h"
 #include "soc15d.h"
 #include "vcn_v2_0.h"
+#include "mmsch_v1_0.h"
 
 #include "vcn/vcn_2_5_offset.h"
 #include "vcn/vcn_2_5_sh_mask.h"
@@ -741,6 +742,62 @@ static int vcn_v2_5_start(struct amdgpu_device *adev)
        return 0;
 }
 
+static int vcn_v2_5_mmsch_start(struct amdgpu_device *adev,
+                               struct amdgpu_mm_table *table)
+{
+       uint32_t data = 0, loop = 0, size = 0;
+       uint64_t addr = table->gpu_addr;
+       struct mmsch_v1_1_init_header *header = NULL;;
+
+       header = (struct mmsch_v1_1_init_header *)table->cpu_addr;
+       size = header->total_size;
+
+       /*
+        * 1, write to vce_mmsch_vf_ctx_addr_lo/hi register with GPU mc addr of
+        *  memory descriptor location
+        */
+       WREG32_SOC15(UVD, 0, mmMMSCH_VF_CTX_ADDR_LO, lower_32_bits(addr));
+       WREG32_SOC15(UVD, 0, mmMMSCH_VF_CTX_ADDR_HI, upper_32_bits(addr));
+
+       /* 2, update vmid of descriptor */
+       data = RREG32_SOC15(UVD, 0, mmMMSCH_VF_VMID);
+       data &= ~MMSCH_VF_VMID__VF_CTX_VMID_MASK;
+       /* use domain0 for MM scheduler */
+       data |= (0 << MMSCH_VF_VMID__VF_CTX_VMID__SHIFT);
+       WREG32_SOC15(UVD, 0, mmMMSCH_VF_VMID, data);
+
+       /* 3, notify mmsch about the size of this descriptor */
+       WREG32_SOC15(UVD, 0, mmMMSCH_VF_CTX_SIZE, size);
+
+       /* 4, set resp to zero */
+       WREG32_SOC15(UVD, 0, mmMMSCH_VF_MAILBOX_RESP, 0);
+
+       /*
+        * 5, kick off the initialization and wait until
+        * VCE_MMSCH_VF_MAILBOX_RESP becomes non-zero
+        */
+       WREG32_SOC15(UVD, 0, mmMMSCH_VF_MAILBOX_HOST, 0x10000001);
+
+       data = RREG32_SOC15(UVD, 0, mmMMSCH_VF_MAILBOX_RESP);
+       loop = 10;
+       while ((data & 0x10000002) != 0x10000002) {
+               udelay(100);
+               data = RREG32_SOC15(UVD, 0, mmMMSCH_VF_MAILBOX_RESP);
+               loop--;
+               if (!loop)
+                       break;
+       }
+
+       if (!loop) {
+               dev_err(adev->dev,
+                       "failed to init MMSCH, mmMMSCH_VF_MAILBOX_RESP = %x\n",
+                       data);
+               return -EBUSY;
+       }
+
+       return 0;
+}
+
 static int vcn_v2_5_stop(struct amdgpu_device *adev)
 {
        uint32_t tmp;