diff options
| author | Huang Rui <[email protected]> | 2017-06-08 01:32:38 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2017-07-14 15:05:59 +0000 |
| commit | 7504938f8e733053c8cf17dd7ac1f28053b8126a (patch) | |
| tree | c8fdea0271cadf7053bcb6298faaf69bad609833 /drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | |
| parent | drm/amdgpu: bind BOs with GTT space allocated directly v2 (diff) | |
| download | kernel-7504938f8e733053c8cf17dd7ac1f28053b8126a.tar.gz kernel-7504938f8e733053c8cf17dd7ac1f28053b8126a.zip | |
drm/amdgpu: add check when no firmware need to load
Signed-off-by: Huang Rui <[email protected]>
Reviewed-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 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c index 4f50eeb65855..17a935df8e1d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c @@ -377,6 +377,11 @@ int amdgpu_ucode_init_bo(struct amdgpu_device *adev) struct amdgpu_firmware_info *ucode = NULL; const struct common_firmware_header *header = NULL; + if (!adev->firmware.fw_size) { + dev_warn(adev->dev, "No ip firmware need to load\n"); + return 0; + } + err = amdgpu_bo_create(adev, adev->firmware.fw_size, PAGE_SIZE, true, amdgpu_sriov_vf(adev) ? AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT, AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS, @@ -459,6 +464,9 @@ int amdgpu_ucode_fini_bo(struct amdgpu_device *adev) int i; struct amdgpu_firmware_info *ucode = NULL; + if (!adev->firmware.fw_size) + return 0; + for (i = 0; i < adev->firmware.max_ucodes; i++) { ucode = &adev->firmware.ucode[i]; if (ucode->fw) { |