]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/amdgpu/ucode: add default behavior
authorAlex Deucher <alexander.deucher@amd.com>
Mon, 9 Aug 2021 20:47:54 +0000 (16:47 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 4 Oct 2021 19:23:01 +0000 (15:23 -0400)
Default to PSP ucode loading unless the user specifies
direct.

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

index 527d67ded8a008a55773fa191842db4d87ec63c6..0c3127f37686c47bd1f17c8590d28ae3b06f089c 100644 (file)
@@ -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)