Applied. Thanks!

Alex

On Fri, Apr 16, 2021 at 10:38 AM Lee Jones lee.jones@linaro.org wrote:

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c: In function ‘amdgpu_device_suspend’: drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:3733:6: warning: variable ‘r’ set but not used [-Wunused-but-set-variable]

Cc: Alex Deucher alexander.deucher@amd.com Cc: "Christian König" christian.koenig@amd.com Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch Cc: Sumit Semwal sumit.semwal@linaro.org Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones lee.jones@linaro.org

---

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index b4ad1c055c702..eef54b265ffdd 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3730,7 +3730,6 @@ void amdgpu_device_fini(struct amdgpu_device *adev) int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) { struct amdgpu_device *adev = drm_to_adev(dev);

•   int r;
  
    if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
            return 0;
  

@@ -3745,7 +3744,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon)

    amdgpu_ras_suspend(adev);

•   r = amdgpu_device_ip_suspend_phase1(adev);
  

•   amdgpu_device_ip_suspend_phase1(adev);
  
    if (!adev->in_s0ix)
            amdgpu_amdkfd_suspend(adev, adev->in_runpm);
  

@@ -3755,7 +3754,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon)

    amdgpu_fence_driver_suspend(adev);

•   r = amdgpu_device_ip_suspend_phase2(adev);
  

•   amdgpu_device_ip_suspend_phase2(adev);
    /* evict remaining vram memory
     * This second call to evict vram is to evict the gart page table
     * using the CPU.
  

-- 2.27.0

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel