hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Shirish S 2018-07-20 17:26:50 +05:30 committed by Alex Deucher
parent 3dbd823e53
commit ecb8c50382
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2691,11 +2691,9 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon)
DRM_ERROR("amdgpu asic reset failed\n"); DRM_ERROR("amdgpu asic reset failed\n");
} }
if (fbcon) { if (fbcon)
console_lock();
amdgpu_fbdev_set_suspend(adev, 1); amdgpu_fbdev_set_suspend(adev, 1);
console_unlock();
}
return 0; return 0;
} }
@ -2780,9 +2778,7 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
} }
drm_modeset_unlock_all(dev); drm_modeset_unlock_all(dev);
} }
console_lock();
amdgpu_fbdev_set_suspend(adev, 0); amdgpu_fbdev_set_suspend(adev, 0);
console_unlock();
} }
drm_kms_helper_poll_enable(dev); drm_kms_helper_poll_enable(dev);

4
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
View File

@ -373,8 +373,8 @@ void amdgpu_fbdev_fini(struct amdgpu_device *adev)
void amdgpu_fbdev_set_suspend(struct amdgpu_device *adev, int state) void amdgpu_fbdev_set_suspend(struct amdgpu_device *adev, int state)
{ {
if (adev->mode_info.rfbdev) if (adev->mode_info.rfbdev)
drm_fb_helper_set_suspend(&adev->mode_info.rfbdev->helper, drm_fb_helper_set_suspend_unlocked(&adev->mode_info.rfbdev->helper,
state); state);
} }
int amdgpu_fbdev_total_size(struct amdgpu_device *adev) int amdgpu_fbdev_total_size(struct amdgpu_device *adev)