diff options
| author | Dave Airlie <[email protected]> | 2019-06-06 01:53:13 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2019-06-06 01:53:36 +0000 |
| commit | 75cb3776fdffa94b424406aeb0efb76b122990f5 (patch) | |
| tree | e5ff0d071afe96491867c07138cd44a49bfd99a1 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | Merge tag 'drm-intel-fixes-2019-06-03' of git://anongit.freedesktop.org/drm/d... (diff) | |
| parent | drm/amd/amdgpu: add RLC firmware to support raven1 refresh (diff) | |
| download | kernel-75cb3776fdffa94b424406aeb0efb76b122990f5.tar.gz kernel-75cb3776fdffa94b424406aeb0efb76b122990f5.zip | |
Merge branch 'drm-fixes-5.2' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
- A fix to make VCE resume more reliable
- Updates for new raven variants
Signed-off-by: Dave Airlie <[email protected]>
From: Alex Deucher <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index cc8ad3831982..f4ac632a87b2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1589,6 +1589,7 @@ static int amdgpu_device_fw_loading(struct amdgpu_device *adev) { int r = 0; int i; + uint32_t smu_version; if (adev->asic_type >= CHIP_VEGA10) { for (i = 0; i < adev->num_ip_blocks; i++) { @@ -1614,16 +1615,9 @@ static int amdgpu_device_fw_loading(struct amdgpu_device *adev) } } } + r = amdgpu_pm_load_smu_firmware(adev, &smu_version); - if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->load_firmware) { - r = adev->powerplay.pp_funcs->load_firmware(adev->powerplay.pp_handle); - if (r) { - pr_err("firmware loading failed\n"); - return r; - } - } - - return 0; + return r; } /** |