diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-03 13:46:06 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-03 13:46:06 +1000 |
commit | 6f127d4fcee90eefdabfc98c37e6760672f05e26 (patch) | |
tree | 8767332c5614134d34aea07a8f99fdb101a44ee1 /drivers/gpu | |
parent | 2aee6a1f2a88f732bca9ce4d926a5cc688e67b75 (diff) | |
parent | 5e032f67ae9d946cbbe5f1087fca0b652b2e3892 (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index b78cbe74dadf..442a15443fa5 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -399,6 +399,14 @@ 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); |