Skip to content

Commit

Permalink
Revert "drm/fb-helper: don't sleep for screen unblank when an oops is…
Browse files Browse the repository at this point in the history
… in progress"

This reverts commit 928c2f0.

This patch double applied, two checks for the price of one.

Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Dave Airlie committed Oct 9, 2013
1 parent 1d083bc commit ecc7e6f
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions drivers/gpu/drm/drm_fb_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -407,14 +407,6 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode)
struct drm_connector *connector;
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.
* Since we already have our own special panic handler which will
Expand Down

0 comments on commit ecc7e6f

Please sign in to comment.