Attachment 37693 Details for Bug 29449 – Persevere without a fixed mode

[patch] Persevere without a fixed mode

0001-drm-i915-sdvo-Only-set-is_lvds-if-we-have-a-valid-fi.patch (text/plain), 2.84 KB, created by Chris Wilson on 2010-08-08 06:27:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2010-08-08 06:27:42 UTC

Size: 2.84 KB

patch

obsolete

>From 1f625dadb153c8d5fce469592873053fd20f49b4 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Sun, 8 Aug 2010 14:13:16 +0100
>Subject: [PATCH] drm/i915/sdvo: Only set is_lvds if we have a valid fixed mode.
>
>If we have failed to ascertain the fixed mode for the LVDS panel, then
>trust the pixel clock ranges reported for the connection when determing
>valid modes. This makes intel_sdvo_mode_valid() consistent with
>intel_lvds_mode_valid() which is also a no-op is there is no fixed mode
>defined. (Since the mode is both validated by SDVO and LVDS, why are
>checking against an LVDS fixed mode in SDVO...)
>
>By only defining is_lvds to be true when we actually have an LVDS output
>with a fixed mode, we avoid various potential NULL deferences where the
>assumption is made that all LVDS outputs have a fixed mode.
>
>References:
>
>  Bug 29449 - [Q35] failure to read EDID/vbios for LVDS, no mode => no output
>  https://bugs.freedesktop.org/show_bug.cgi?id=29449
>
>The primary failure in this bug is not finding the EDID and determining
>the correct fixed panel mode. However, this patch should fix the
>secondary issue of not enabling any of the standard modes for the panel
>either.
>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/intel_sdvo.c |   10 +++-------
> 1 files changed, 3 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
>index 8baa596..8a1ae76 100644
>--- a/drivers/gpu/drm/i915/intel_sdvo.c
>+++ b/drivers/gpu/drm/i915/intel_sdvo.c
>@@ -1275,10 +1275,7 @@ static int intel_sdvo_mode_valid(struct drm_connector *connector,
> 	if (intel_sdvo->pixel_clock_max < mode->clock)
> 		return MODE_CLOCK_HIGH;
> 
>-	if (intel_sdvo->is_lvds == true) {
>-		if (intel_sdvo->sdvo_lvds_fixed_mode == NULL)
>-			return MODE_PANEL;
>-
>+	if (intel_sdvo->is_lvds) {
> 		if (mode->hdisplay > intel_sdvo->sdvo_lvds_fixed_mode->hdisplay)
> 			return MODE_PANEL;
> 
>@@ -1535,7 +1532,7 @@ static enum drm_connector_status intel_sdvo_detect(struct drm_connector *connect
> 			intel_sdvo->base.needs_tv_clock = true;
> 		}
> 		if (response & SDVO_LVDS_MASK)
>-			intel_sdvo->is_lvds = true;
>+			intel_sdvo->is_lvds = intel_sdvo->sdvo_lvds_fixed_mode != NULL;
> 	}
> 
> 	return ret;
>@@ -1698,6 +1695,7 @@ end:
> 		if (newmode->type & DRM_MODE_TYPE_PREFERRED) {
> 			intel_sdvo->sdvo_lvds_fixed_mode =
> 				drm_mode_duplicate(connector->dev, newmode);
>+			intel_sdvo->is_lvds = true;
> 			break;
> 		}
> 	}
>@@ -2200,8 +2198,6 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
>         encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
>         connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
> 
>-        intel_sdvo->is_lvds = true;
>-
>         if (device == 0) {
>                 intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS0;
>                 intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS0;
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 29449: 37689 | 37690 | 37691 | 37692 | 37693 | 37818 | 38473

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.