Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecc7e6f3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Revert "drm/fb-helper: don't sleep for screen unblank when an oops is in progress" 



This reverts commit 928c2f0c.

This patch double applied, two checks for the price of one.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 1d083bc9

drivers/gpu/drm/drm_fb_helper.c

+0 −8
Original line number Diff line number Diff line
@@ -407,14 +407,6 @@ 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;



	/*

	 * fbdev->blank can be called from irq context in case of a panic.

	 * Since we already have our own special panic handler which will