diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-07-28 13:18:41 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-08-06 14:13:01 +0200 |
| commit | dd908c864d9a8347216291b4b61074777458373a (patch) | |
| tree | 6d1737b3d5cb3c182307d976c9a1bd71f408e858 /drivers/gpu/drm/drm_fb_helper.c | |
| parent | c50bfd08d60cefbe1714c4a53b1c325982858549 (diff) | |
| download | talos-obmc-linux-dd908c864d9a8347216291b4b61074777458373a.tar.gz talos-obmc-linux-dd908c864d9a8347216291b4b61074777458373a.zip | |
drm/fb-helper: Stop using trylocks in force_restore
Since the panic handling is gone this is only used for force-restoring
the fbdev/fbcon from sysrq, and that's done with a work item. No need
any more to do trylocks, we can just do normal locking.
Reviewed-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/drm_fb_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index f16eed0489f8..e4bbb5309602 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -416,19 +416,10 @@ static bool drm_fb_helper_force_kernel_mode(void) if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) continue; - /* - * NOTE: Use trylock mode to avoid deadlocks and sleeping in - * panic context. - */ - if (__drm_modeset_lock_all(dev, true) != 0) { - error = true; - continue; - } - + drm_modeset_lock_all(dev); ret = drm_fb_helper_restore_fbdev_mode(helper); if (ret) error = true; - drm_modeset_unlock_all(dev); } return error; |
