From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: [PATCH 6/6] drm/i915: inform drm_fb_helper if we abandoned a connected output Date: Thu, 12 Dec 2013 12:41:57 -0800 Message-ID: <1386880917-2951-6-git-send-email-jbarnes@virtuousgeek.org> References: <1386880917-2951-1-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from alt-proxy6.mail.unifiedlayer.com (alt-proxy6.mail.unifiedlayer.com [66.147.245.65]) by gabe.freedesktop.org (Postfix) with SMTP id 86604FA367 for ; Thu, 12 Dec 2013 12:48:46 -0800 (PST) Received: from [67.161.37.189] (port=48326 helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (UNKNOWN:CAMELLIA256-SHA:256) (Exim 4.80) (envelope-from ) id 1VrD5B-0001dy-U7 for intel-gfx@lists.freedesktop.org; Thu, 12 Dec 2013 13:42:06 -0700 In-Reply-To: <1386880917-2951-1-git-send-email-jbarnes@virtuousgeek.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Otherwise subsequent fb activity will try to do blank/unblank on outputs that were never fully enabled. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_fbdev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index 53675d2..dcadd32 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -308,6 +308,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, if (!encoder || !encoder->crtc) { DRM_DEBUG_KMS("connector %d has no encoder or crtc, skipping\n", connector->base.id); + enabled[i] = false; continue; } @@ -315,6 +316,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, DRM_DEBUG_KMS("connector %s on crtc %d has inconsistent state, aborting\n", drm_get_connector_name(connector), encoder->crtc->base.id); + enabled[i] = false; return false; } @@ -322,6 +324,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, DRM_DEBUG_KMS("connector %s on inactive crtc %d, borting\n", drm_get_connector_name(connector), encoder->crtc->base.id); + enabled[i] = false; return false; } -- 1.8.4.2