summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
diff options
context:
space:
mode:
authorAaron Liu <aaron.liu@amd.com>2019-08-09 10:32:15 -0500
committerAlex Deucher <alexander.deucher@amd.com>2019-08-12 12:47:50 -0500
commit6a7a0bdbfa0c2453fb6c59c41a767d0e5307f793 (patch)
treeb8b0db0190c35180f78c072d0eceeeab97eb8289 /drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
parent6b3ad3b2da2861cf1e7649d1f6dc699aa8e4910b (diff)
drm/amdgpu: add psp_v12_0 for renoir (v2)
1. Add psp ip block 2. Use direct loading type by default and it can also config psp loading type. 3. Bypass sos fw loading and xgmi&ras interface v2: drop TA loading Acked-by: Huang Rui <ray.huang@amd.com> Signed-off-by: Aaron Liu <aaron.liu@amd.com> Reviewed-by: Huang Rui <ray.huang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
index 33ed17418f62..fca328590f25 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
@@ -368,8 +368,13 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)
else
return AMDGPU_FW_LOAD_PSP;
case CHIP_ARCTURUS:
- case CHIP_RENOIR:
return AMDGPU_FW_LOAD_DIRECT;
+ case CHIP_RENOIR:
+ if (load_type == AMDGPU_FW_LOAD_PSP)
+ return AMDGPU_FW_LOAD_PSP;
+ else
+ return AMDGPU_FW_LOAD_DIRECT;
+
default:
DRM_ERROR("Unknown firmware load type\n");
}