On Mon, Jun 20, 2016 at 03:57:39PM +0200, Maarten Lankhorst wrote: > Signed-off-by: Maarten Lankhorst <[email protected]> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c > b/drivers/gpu/drm/i915/i915_debugfs.c > index 38f2cbc19f4a..7ee24626e0a6 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -2989,14 +2989,20 @@ static void intel_connector_info(struct seq_file *m, > seq_printf(m, "\tCEA rev: %d\n", > connector->display_info.cea_rev); > } > - if (intel_encoder) { > - if (intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT || > - intel_encoder->type == INTEL_OUTPUT_EDP) > + > + switch (connector->connector_type) { > + case DRM_MODE_CONNECTOR_DisplayPort: > + case DRM_MODE_CONNECTOR_eDP: > + if (intel_encoder->type != INTEL_OUTPUT_DP_MST) > intel_dp_info(m, intel_connector); > - else if (intel_encoder->type == INTEL_OUTPUT_HDMI) > - intel_hdmi_info(m, intel_connector); > - else if (intel_encoder->type == INTEL_OUTPUT_LVDS) > + break; > + case DRM_MODE_CONNECTOR_LVDS: > + if (intel_encoder->type != INTEL_OUTPUT_SDVO)
This could blow up with DVO I think. It would be a bit more clear (and less dangerous) to keep checking for the encoder type(s) we want, rather than exclude types we don't want. With that stuff fixed, the series lgtm Reviewed-by: Ville Syrjälä <[email protected]> > intel_lvds_info(m, intel_connector); > + break; > + case DRM_MODE_CONNECTOR_HDMIA: > + if (intel_encoder->type != INTEL_OUTPUT_SDVO) > + intel_hdmi_info(m, intel_connector); > } > > seq_printf(m, "\tmodes:\n"); > -- > 2.5.5 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
