summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
diff options
context:
space:
mode:
authorShirish S <shirish.s@amd.com>2018-07-20 17:26:50 +0530
committerAlex Deucher <alexander.deucher@amd.com>2018-07-20 14:24:18 -0500
commitecb8c50382e2e8bfd60483e3edf8cb883f7bde62 (patch)
tree4f87fd9befa9f026d5ad9edbf03332646a22272b /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
parent3dbd823e53b572df1c84d73e85c518212fcdaddb (diff)
downloadop-kernel-dev-ecb8c50382e2e8bfd60483e3edf8cb883f7bde62.zip
op-kernel-dev-ecb8c50382e2e8bfd60483e3edf8cb883f7bde62.tar.gz
drm/amdgpu: use drm_fb helper for console_(un)lock
This patch removes the usage of console_(un)lock by replacing drm_fb_helper_set_suspend() to drm_fb_helper_set_suspend_unlocked() which locks and unlocks the console instead of locking ourselves. Signed-off-by: Shirish S <shirish.s@amd.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_device.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index fddf547..e57f90f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2691,11 +2691,9 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon)
DRM_ERROR("amdgpu asic reset failed\n");
}
- if (fbcon) {
- console_lock();
+ if (fbcon)
amdgpu_fbdev_set_suspend(adev, 1);
- console_unlock();
- }
+
return 0;
}
@@ -2780,9 +2778,7 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
}
drm_modeset_unlock_all(dev);
}
- console_lock();
amdgpu_fbdev_set_suspend(adev, 0);
- console_unlock();
}
drm_kms_helper_poll_enable(dev);
OpenPOWER on IntegriCloud