|
@@ -407,6 +407,14 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode)
|
|
struct drm_connector *connector;
|
|
struct drm_connector *connector;
|
|
int i, j;
|
|
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.
|
|
* fbdev->blank can be called from irq context in case of a panic.
|
|
* Since we already have our own special panic handler which will
|
|
* Since we already have our own special panic handler which will
|