summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2013-10-10 07:05:41 +1000
committerDave Airlie <airlied@redhat.com>2013-10-10 07:05:41 +1000
commitecc7e6f3bb8ad56764667aeabb860c24a6fa37f9 (patch)
treec48295e6ad1ea4c370632f19ee1e5671a757d2a6 /drivers/gpu
parent1d083bc93d159ebcb46c5cbeca512ddd74a74e4b (diff)
downloadop-kernel-dev-ecc7e6f3bb8ad56764667aeabb860c24a6fa37f9.zip
op-kernel-dev-ecc7e6f3bb8ad56764667aeabb860c24a6fa37f9.tar.gz
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 <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/drm_fb_helper.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index f6f6cc7..3d13ca6e2 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -416,14 +416,6 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode)
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
- * restore the fbdev console mode completely, just bail out early.
- */
- if (oops_in_progress)
- return;
-
- /*
* For each CRTC in this fb, turn the connectors on/off.
*/
drm_modeset_lock_all(dev);
OpenPOWER on IntegriCloud