]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
drm/amdgpu: set fw default loading by psp for renoir
authorAaron Liu <aaron.liu@amd.com>
Fri, 9 Aug 2019 15:46:36 +0000 (10:46 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 12 Aug 2019 17:47:50 +0000 (12:47 -0500)
By default, set amdgpu ucode type to AMDGPU_FW_LOAD_PSP.

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>
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c

index fca328590f25ff30c3c26c11fa9432a11e1a087b..c2a0d1742736e76813277ee8b3a0f3c0af2e5090 100644 (file)
@@ -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");