Commit ecc7e6f3 authored by Dave Airlie's avatar Dave Airlie

Revert "drm/fb-helper: don't sleep for screen unblank when an oops is in progress"

This reverts commit 928c2f0c.

This patch double applied, two checks for the price of one.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 1d083bc9
...@@ -407,14 +407,6 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode) ...@@ -407,14 +407,6 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode)
struct drm_connector *connector; struct drm_connector *connector;
int i, j; int i, j;
/*
* fbdev->blank can be called from irq context in case of a panic.
* Since we already have our own special panic handler which will
* restore the fbdev console mode completely, just bail out early.
*/
if (oops_in_progress)
return;
/* /*
* fbdev->blank can be called from irq context in case of a panic. * fbdev->blank can be called from irq context in case of a panic.
* Since we already have our own special panic handler which will * Since we already have our own special panic handler which will
......
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