Commit dd908c86 authored by Daniel Vetter's avatar Daniel Vetter

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: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent c50bfd08
...@@ -416,19 +416,10 @@ static bool drm_fb_helper_force_kernel_mode(void) ...@@ -416,19 +416,10 @@ static bool drm_fb_helper_force_kernel_mode(void)
if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
continue; continue;
/* drm_modeset_lock_all(dev);
* NOTE: Use trylock mode to avoid deadlocks and sleeping in
* panic context.
*/
if (__drm_modeset_lock_all(dev, true) != 0) {
error = true;
continue;
}
ret = drm_fb_helper_restore_fbdev_mode(helper); ret = drm_fb_helper_restore_fbdev_mode(helper);
if (ret) if (ret)
error = true; error = true;
drm_modeset_unlock_all(dev); drm_modeset_unlock_all(dev);
} }
return error; return error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment