]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/amdgpu: Set vega20 load_type to AMDGPU_FW_LOAD_DIRECT.
authorFeifei Xu <Feifei.Xu@amd.com>
Tue, 24 Apr 2018 03:11:16 +0000 (11:11 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 17 May 2018 15:13:22 +0000 (10:13 -0500)
Please revert this patch when psp load fw is enabled.

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c

index b419d6e33b3abe1e34eb22ad752f9da161cdfd90..f55f72a37ca838d223cd9759ae6c8b2fddff0875 100644 (file)
@@ -303,11 +303,12 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)
        case CHIP_VEGA10:
        case CHIP_RAVEN:
        case CHIP_VEGA12:
-       case CHIP_VEGA20:
                if (!load_type)
                        return AMDGPU_FW_LOAD_DIRECT;
                else
                        return AMDGPU_FW_LOAD_PSP;
+       case CHIP_VEGA20:
+               return AMDGPU_FW_LOAD_DIRECT;
        default:
                DRM_ERROR("Unknown firmware load type\n");
        }