From 5934b99de598865073529455e871cf87ed2abd93 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Fri, 9 Aug 2019 10:46:36 -0500 Subject: [PATCH 3392/4256] drm/amdgpu: set fw default loading by psp for renoir By default, set amdgpu ucode type to AMDGPU_FW_LOAD_PSP. Acked-by: Huang Rui Signed-off-by: Aaron Liu Reviewed-by: Huang Rui Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c index ee6a9bee8f08..35fd46bdfc53 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c @@ -360,6 +360,7 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type) case CHIP_RAVEN: case CHIP_VEGA12: case CHIP_VEGA20: + case CHIP_RENOIR: case CHIP_NAVI10: case CHIP_NAVI14: case CHIP_NAVI12: @@ -369,11 +370,6 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type) return AMDGPU_FW_LOAD_PSP; case CHIP_ARCTURUS: 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"); -- 2.17.1