drm/amdgpu:add VCN booting with firmware loaded by PSP

Setup psp firmware loading for VCN, and make VCN block
booting from tmr mac address.

Signed-off-by: James Zhu <James.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Likun Gao <Likun.Gao@amd.com>
Signed-off-by: Likun Gao <Likun.Gao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

1 files changed, 10 insertions, 7 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 798648a19710..290d5583135b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -111,9 +111,10 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
                         version_major, version_minor, family_id);
         }
 
-        bo_size = AMDGPU_GPU_PAGE_ALIGN(le32_to_cpu(hdr->ucode_size_bytes) + 8)
-                  +  AMDGPU_VCN_STACK_SIZE + AMDGPU_VCN_HEAP_SIZE
+        bo_size = AMDGPU_VCN_STACK_SIZE + AMDGPU_VCN_HEAP_SIZE
                   +  AMDGPU_VCN_SESSION_SIZE * 40;
+        if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP)
+                bo_size += AMDGPU_GPU_PAGE_ALIGN(le32_to_cpu(hdr->ucode_size_bytes) + 8);
         r = amdgpu_bo_create_kernel(adev, bo_size, PAGE_SIZE,
                                     AMDGPU_GEM_DOMAIN_VRAM, &adev->vcn.vcpu_bo,
                                     &adev->vcn.gpu_addr, &adev->vcn.cpu_addr);
@@ -189,11 +190,13 @@ int amdgpu_vcn_resume(struct amdgpu_device *adev)
                 unsigned offset;
 
                 hdr = (const struct common_firmware_header *)adev->vcn.fw->data;
-                offset = le32_to_cpu(hdr->ucode_array_offset_bytes);
-                memcpy_toio(adev->vcn.cpu_addr, adev->vcn.fw->data + offset,
-                            le32_to_cpu(hdr->ucode_size_bytes));
-                size -= le32_to_cpu(hdr->ucode_size_bytes);
-                ptr += le32_to_cpu(hdr->ucode_size_bytes);
+                if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {
+                        offset = le32_to_cpu(hdr->ucode_array_offset_bytes);
+                        memcpy_toio(adev->vcn.cpu_addr, adev->vcn.fw->data + offset,
+                                    le32_to_cpu(hdr->ucode_size_bytes));
+                        size -= le32_to_cpu(hdr->ucode_size_bytes);
+                        ptr += le32_to_cpu(hdr->ucode_size_bytes);
+                }
                 memset_io(ptr, 0, size);
         }