[Intel-gfx] [PATCH 6/6] drm/i915: inform drm_fb_helper if we abandoned a connected output

[Jesse Barnes]

Otherwise subsequent fb activity will try to do blank/unblank on outputs
that were never fully enabled.

Signed-off-by: Jesse Barnes <jbar...@virtuousgeek.org>
---
 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

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx