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> Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
parent
aa40d6bbb9
commit
8545423a91
|
@ -1274,10 +1274,7 @@ static int intel_sdvo_mode_valid(struct drm_connector *connector,
|
||||||
if (intel_sdvo->pixel_clock_max < mode->clock)
|
if (intel_sdvo->pixel_clock_max < mode->clock)
|
||||||
return MODE_CLOCK_HIGH;
|
return MODE_CLOCK_HIGH;
|
||||||
|
|
||||||
if (intel_sdvo->is_lvds == true) {
|
if (intel_sdvo->is_lvds) {
|
||||||
if (intel_sdvo->sdvo_lvds_fixed_mode == NULL)
|
|
||||||
return MODE_PANEL;
|
|
||||||
|
|
||||||
if (mode->hdisplay > intel_sdvo->sdvo_lvds_fixed_mode->hdisplay)
|
if (mode->hdisplay > intel_sdvo->sdvo_lvds_fixed_mode->hdisplay)
|
||||||
return MODE_PANEL;
|
return MODE_PANEL;
|
||||||
|
|
||||||
|
@ -1534,7 +1531,7 @@ static enum drm_connector_status intel_sdvo_detect(struct drm_connector *connect
|
||||||
intel_sdvo->base.needs_tv_clock = true;
|
intel_sdvo->base.needs_tv_clock = true;
|
||||||
}
|
}
|
||||||
if (response & SDVO_LVDS_MASK)
|
if (response & SDVO_LVDS_MASK)
|
||||||
intel_sdvo->is_lvds = true;
|
intel_sdvo->is_lvds = intel_sdvo->sdvo_lvds_fixed_mode != NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -1697,6 +1694,7 @@ end:
|
||||||
if (newmode->type & DRM_MODE_TYPE_PREFERRED) {
|
if (newmode->type & DRM_MODE_TYPE_PREFERRED) {
|
||||||
intel_sdvo->sdvo_lvds_fixed_mode =
|
intel_sdvo->sdvo_lvds_fixed_mode =
|
||||||
drm_mode_duplicate(connector->dev, newmode);
|
drm_mode_duplicate(connector->dev, newmode);
|
||||||
|
intel_sdvo->is_lvds = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2190,8 +2188,6 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
|
||||||
encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
|
encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
|
||||||
connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
|
connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
|
||||||
|
|
||||||
intel_sdvo->is_lvds = true;
|
|
||||||
|
|
||||||
if (device == 0) {
|
if (device == 0) {
|
||||||
intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS0;
|
intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS0;
|
||||||
intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS0;
|
intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS0;
|
||||||
|
|
Loading…
Reference in a new issue