diff --git a/[refs] b/[refs]
index 5de8eb59f8f0..b9e73ea06a77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 207fd32970b1def91b11ae28f6bebffc792db714
+refs/heads/master: 1b1d5397058f06bc5bd87d43ed93f34b28546ea4
diff --git a/trunk/drivers/gpu/drm/drm_fb_helper.c b/trunk/drivers/gpu/drm/drm_fb_helper.c
index 94f304d8b795..59d6b9bf204b 100644
--- a/trunk/drivers/gpu/drm/drm_fb_helper.c
+++ b/trunk/drivers/gpu/drm/drm_fb_helper.c
@@ -390,6 +390,14 @@ 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;
+
 	/*
 	 * For each CRTC in this fb, turn the connectors on/off.
 	 */