Merge branch ‘drm-fixes-5.2’ of git://people.freedesktop.org/~agd5f/linux into drm-fixes [Linux 5.2]

Merge branch ‘drm-fixes-5.2’ of git://people.freedesktop.org/~agd5f/linux into drm-fixes [Linux 5.2]

This Linux kernel change "Merge branch ‘drm-fixes-5.2’ of git://people.freedesktop.org/~agd5f/linux into drm-fixes" is included in the Linux 5.2 release. This change is authored by Daniel Vetter <daniel.vetter [at] ffwll.ch> on Fri Jun 14 17:46:54 2019 +0200. The commit for this change in Linux stable tree is e14c587 (patch). Other info about this change: Merge: 744ed8c f3a5231

Merge branch 'drm-fixes-5.2' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

Fixes for 5.2:
- Extend previous vce fix for resume to uvd and vcn
- Fix bounds checking in ras debugfs interface
- Fix a regression on SI using amdgpu

Signed-off-by: Daniel Vetter <[email protected]>
From: Alex Deucher <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index 039cfa2..abeaab4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -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)

Leave a Reply

Your email address will not be published. Required fields are marked *