diff options
| author | Alex Deucher <[email protected]> | 2021-08-09 20:47:54 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2021-10-04 19:23:01 +0000 |
| commit | aa9f8cc349dea910930a755ea1ff9fe4fa530958 (patch) | |
| tree | 47451217e000aa85995312de20d93bdbb5eba6ff /drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | |
| parent | drm/amdgpu: get VCN harvest information from IP discovery table (diff) | |
| download | kernel-aa9f8cc349dea910930a755ea1ff9fe4fa530958.tar.gz kernel-aa9f8cc349dea910930a755ea1ff9fe4fa530958.zip | |
drm/amdgpu/ucode: add default behavior
Default to PSP ucode loading unless the user specifies
direct.
Acked-by: Christian König <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c index 527d67ded8a0..0c3127f37686 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) |