Attachment 95113 Details for Bug 75552 – fallback to old initial config if not all outputs are enabled

[patch] fallback to old initial config if not all outputs are enabled

fallback.patch (text/plain), 2.02 KB, created by Daniel Vetter on 2014-03-04 19:17:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2014-03-04 19:17:39 UTC

Size: 2.02 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
>index 4e4b461e0a70..9867638954f0 100644
>--- a/drivers/gpu/drm/i915/intel_fbdev.c
>+++ b/drivers/gpu/drm/i915/intel_fbdev.c
>@@ -289,7 +289,9 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
> 	struct drm_device *dev = fb_helper->dev;
> 	int i, j;
> 	bool *save_enabled;
>-	bool any_enabled = false;
>+	bool fallback = true;
>+	int num_connectors_enabled = 0;
>+	int num_connectors_detected = 0;
> 
> 	/*
> 	 * If the user specified any force options, just bail here
>@@ -324,12 +326,18 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
> 
> 		fb_conn = fb_helper->connector_info[i];
> 		connector = fb_conn->connector;
>+
>+		if (connector->status == connector_status_connected)
>+			num_connectors_detected++;
>+
> 		if (!enabled[i]) {
> 			DRM_DEBUG_KMS("connector %d not enabled, skipping\n",
> 				      connector->base.id);
> 			continue;
> 		}
> 
>+		num_connectors_enabled++;
>+
> 		encoder = connector->encoder;
> 		if (!encoder || WARN_ON(!encoder->crtc)) {
> 			DRM_DEBUG_KMS("connector %d has no encoder or crtc, skipping\n",
>@@ -347,7 +355,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
> 		 */
> 		for (j = 0; j < fb_helper->connector_count; j++) {
> 			if (crtcs[j] == new_crtc) {
>-				any_enabled = false;
>+				fallback = true;
> 				goto out;
> 			}
> 		}
>@@ -390,11 +398,20 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
> 			      encoder->crtc->base.id,
> 			      modes[i]->name);
> 
>-		any_enabled = true;
>+		fallback = false;
> 	}
> 
>+	/*
>+	 * If the BIOS didn't enable everything it could, fall back to have the
>+	 * same user experiencing of lighting up as much as possible like the
>+	 * fbdev helper library.
>+	 */
>+	if (num_connectors_enabled != num_connectors_detected &&
>+	    num_connectors_enabled < INTEL_INFO(dev)->num_pipes)
>+		fallback = true;
>+
> out:
>-	if (!any_enabled) {
>+	if (fallback) {
> 		memcpy(enabled, save_enabled, dev->mode_config.num_connector);
> 		kfree(save_enabled);
> 		return false;

Actions: View | Splinter Review

Attachments on bug 75552: 95113

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.