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

Commit 164c8598 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Add some debug breadcrumbs to connector detection 



Try to decypher detection failures is a little tricker at the moment as
the only indicator of progress is when output_poll_execute() tells us
the result after the connector->detect() has run. This patch adds a
telltale to the start of each detect function so that we can track
progress and associate activity more clearly with each connector.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d8fc8a47

drivers/gpu/drm/i915/intel_crt.c

+4 −0
Original line number Diff line number Diff line
@@ -613,6 +613,10 @@ intel_crt_detect(struct drm_connector *connector, bool force) 
	enum drm_connector_status status;

	struct intel_load_detect_pipe tmp;



	DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force=%d\n",

		      connector->base.id, drm_get_connector_name(connector),

		      force);



	if (I915_HAS_HOTPLUG(dev)) {

		/* We can not rely on the HPD pin always being correctly wired

		 * up, for example many KVM do not pass it through, and so

drivers/gpu/drm/i915/intel_dp.c

+3 −0
Original line number Diff line number Diff line
@@ -2815,6 +2815,9 @@ intel_dp_detect(struct drm_connector *connector, bool force) 
	enum drm_connector_status status;

	struct edid *edid = NULL;



	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",

		      connector->base.id, drm_get_connector_name(connector));



	intel_dp->has_audio = false;



	if (HAS_PCH_SPLIT(dev))

drivers/gpu/drm/i915/intel_dvo.c

+2 −0
Original line number Diff line number Diff line
@@ -332,6 +332,8 @@ static enum drm_connector_status 
intel_dvo_detect(struct drm_connector *connector, bool force)

{

	struct intel_dvo *intel_dvo = intel_attached_dvo(connector);

	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",

		      connector->base.id, drm_get_connector_name(connector));

	return intel_dvo->dev.dev_ops->detect(&intel_dvo->dev);

}

drivers/gpu/drm/i915/intel_hdmi.c

+3 −0
Original line number Diff line number Diff line
@@ -866,6 +866,9 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) 
	struct edid *edid;

	enum drm_connector_status status = connector_status_disconnected;



	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",

		      connector->base.id, drm_get_connector_name(connector));



	intel_hdmi->has_hdmi_sink = false;

	intel_hdmi->has_audio = false;

	intel_hdmi->rgb_quant_range_selectable = false;

drivers/gpu/drm/i915/intel_lvds.c

+3 −0
Original line number Diff line number Diff line
@@ -339,6 +339,9 @@ intel_lvds_detect(struct drm_connector *connector, bool force) 
	struct drm_device *dev = connector->dev;

	enum drm_connector_status status;



	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",

		      connector->base.id, drm_get_connector_name(connector));



	status = intel_panel_detect(dev);

	if (status != connector_status_unknown)

		return status;