projects
/
platform
/
kernel
/
linux-rpi3.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1d083bc
)
Revert "drm/fb-helper: don't sleep for screen unblank when an oops is in progress"
author
Dave Airlie
<airlied@redhat.com>
Wed, 9 Oct 2013 21:05:41 +0000
(07:05 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Wed, 9 Oct 2013 21:05:41 +0000
(07:05 +1000)
This reverts commit
928c2f0c006bf7f381f58af2b2786d2a858ae311
.
This patch double applied, two checks for the price of one.
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/drm_fb_helper.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/drm_fb_helper.c
b/drivers/gpu/drm/drm_fb_helper.c
index
f6f6cc7
..
3d13ca6
100644
(file)
--- 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);