git/linux-net
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/ synced 2026-04-27 03:58:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge v5.2-rc5 into drm-next

Browse Source 
Maarten needs -rc4 backmerged so he can pull in the fbcon notifier
removal topic branch into drm-misc-next.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter
2019-06-19 12:04:55 +02:00
parent 2454fcea33 9e0babf2c0
commit 52d2d44eee
12204 changed files with 20675 additions and 101164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
View File

@@ -1632,6 +1632,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++) {
@@ -1657,16 +1658,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;
}
/**