Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee648a74 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Use connector_type for printing in intel_connector_info, v2. 



Instead of looking at encoder->type, which may be set to UNKNOWN,
use connector->connector_type. Info cannot be printed for MST
connectors which may have a NULL encoder, return early in that case.

Changes since v1:
- Whitelist encoder types for HDMI and LVDS.
- Fix oops on MST.
- Do not list encoder types for eDP/DP, they're always valid.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/7cf34026-392d-01ec-e79b-e91919d1d783@linux.intel.com
parent 26c17cf6

drivers/gpu/drm/i915/i915_debugfs.c

+19 −7
Original line number Diff line number Diff line
@@ -2989,14 +2989,26 @@ 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)



	if (!intel_encoder || intel_encoder->type == INTEL_OUTPUT_DP_MST)

		return;



	switch (connector->connector_type) {

	case DRM_MODE_CONNECTOR_DisplayPort:

	case DRM_MODE_CONNECTOR_eDP:

		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_LVDS)

			intel_lvds_info(m, intel_connector);

		break;

	case DRM_MODE_CONNECTOR_HDMIA:

		if (intel_encoder->type == INTEL_OUTPUT_HDMI ||

		    intel_encoder->type == INTEL_OUTPUT_UNKNOWN)

			intel_hdmi_info(m, intel_connector);

		break;

	default:

		break;

	}



	seq_printf(m, "\tmodes:\n");