diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-03-10 11:07:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-03-10 11:07:34 +1000 |
| commit | 9813527abc558415dbe4dc0bb5bfbd12aab2c457 (patch) | |
| tree | 873854dc54932c6b2633eaf4272386596eacacbb /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | 31aec642c4eef442b05a96bdd064529099e65729 (diff) | |
| parent | a5b11dac1f57c4b327c2d6eccb8fdd01499f9e17 (diff) | |
Merge branch 'drm-fixes-4.11' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
* 'drm-fixes-4.11' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu: bump driver version for some new features
drm/amdgpu: validate paramaters in the gem ioctl
drm/amd/amdgpu: fix console deadlock if late init failed
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 6abb238b25c9..4120b351a8e5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -2094,8 +2094,11 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) } r = amdgpu_late_init(adev); - if (r) + if (r) { + if (fbcon) + console_unlock(); return r; + } /* pin cursors */ list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { |