]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/amdgpu: return 0 by default in amdgpu_pm_load_smu_firmware
authorAlex Deucher <alexander.deucher@amd.com>
Tue, 11 Jun 2019 14:45:51 +0000 (09:45 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 13 Jun 2019 01:39:49 +0000 (20:39 -0500)
Fixes SI cards running on amdgpu.

Fixes: 1929059893022 ("drm/amd/amdgpu: add RLC firmware to support raven1 refresh")
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=110883
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

index 039cfa2ec89d9d9ada32d9a97731ac6204e8de95..abeaab4bf1bc2f33c8be01e73688b2fd5f59ef3f 100644 (file)
@@ -2492,7 +2492,7 @@ void amdgpu_pm_print_power_states(struct amdgpu_device *adev)
 
 int amdgpu_pm_load_smu_firmware(struct amdgpu_device *adev, uint32_t *smu_version)
 {
-       int r = -EINVAL;
+       int r;
 
        if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->load_firmware) {
                r = adev->powerplay.pp_funcs->load_firmware(adev->powerplay.pp_handle);
@@ -2502,7 +2502,7 @@ int amdgpu_pm_load_smu_firmware(struct amdgpu_device *adev, uint32_t *smu_versio
                }
                *smu_version = adev->pm.fw_version;
        }
-       return r;
+       return 0;
 }
 
 int amdgpu_pm_sysfs_init(struct amdgpu_device *adev)