From: Alex Deucher Date: Mon, 9 Aug 2021 20:47:54 +0000 (-0400) Subject: drm/amdgpu/ucode: add default behavior X-Git-Tag: v5.16-rc1~140^2~11^2~71 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa9f8cc349dea910930a755ea1ff9fe4fa530958;p=thirdparty%2Fkernel%2Flinux.git drm/amdgpu/ucode: add default behavior Default to PSP ucode loading unless the user specifies direct. Acked-by: Christian König Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c index 527d67ded8a00..0c3127f37686c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c @@ -416,10 +416,11 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type) else return AMDGPU_FW_LOAD_PSP; default: - DRM_ERROR("Unknown firmware load type\n"); + if (!load_type) + return AMDGPU_FW_LOAD_DIRECT; + else + return AMDGPU_FW_LOAD_PSP; } - - return AMDGPU_FW_LOAD_DIRECT; } const char *amdgpu_ucode_name(enum AMDGPU_UCODE_ID ucode_id)