From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755296AbdK1LZD (ORCPT ); Tue, 28 Nov 2017 06:25:03 -0500 Received: from mblankhorst.nl ([141.105.120.124]:59544 "EHLO mblankhorst.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755161AbdK1LZB (ORCPT ); Tue, 28 Nov 2017 06:25:01 -0500 X-Greylist: delayed 528 seconds by postgrey-1.27 at vger.kernel.org; Tue, 28 Nov 2017 06:25:01 EST From: Maarten Lankhorst To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, daniel.vetter@ffwll.ch, Thomas Voegtle , intel-gfx@lists.freedesktop.org, Maarten Lankhorst , stable@vger.kernel.org Subject: [PATCH] drm/fb_helper: Disable all crtc's when initial setup fails. Date: Tue, 28 Nov 2017 12:16:03 +0100 Message-Id: <20171128111603.62757-1-maarten.lankhorst@linux.intel.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some drivers like i915 start with crtc's enabled, but with deferred fbcon setup they were no longer disabled as part of fbdev setup. Headless units could no longer enter pc3 state because the crtc was still enabled. Fix this by calling restore_fbdev_mode when we would have called it otherwise once during initial fbdev setup. Signed-off-by: Maarten Lankhorst Fixes: ca91a2758fce ("drm/fb-helper: Support deferred setup") Cc: # v4.14+ Reported-by: Thomas Voegtle --- drivers/gpu/drm/drm_fb_helper.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 07374008f146..e56166334455 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1809,6 +1809,10 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, if (crtc_count == 0 || sizes.fb_width == -1 || sizes.fb_height == -1) { DRM_INFO("Cannot find any crtc or sizes\n"); + + /* First time: disable all crtc's.. */ + if (!fb_helper->deferred_setup && !READ_ONCE(fb_helper->dev->master)) + restore_fbdev_mode(fb_helper); return -EAGAIN; } -- 2.15.0