From: Dave Airlie Date: Wed, 9 Oct 2013 21:05:41 +0000 (+1000) Subject: Revert "drm/fb-helper: don't sleep for screen unblank when an oops is in progress" X-Git-Tag: v3.12-rc5~14^2~3 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ecc7e6f3bb8ad56764667aeabb860c24a6fa37f9;p=~emulex%2Finfiniband.git Revert "drm/fb-helper: don't sleep for screen unblank when an oops is in progress" This reverts commit 928c2f0c006bf7f381f58af2b2786d2a858ae311. This patch double applied, two checks for the price of one. Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index f6f6cc7fc13..3d13ca6e257 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -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