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

Commit 46a3f4a3 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Add some debug spam for intialising SDVO



During SDVO initialisation it would be useful to a have a record of the
individual devices we try to enable and later probe - in particular to
be able to see which fail.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent aec347ab
Loading
Loading
Loading
Loading
+18 −2
Original line number Original line Diff line number Diff line
@@ -1773,6 +1773,9 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
{
{
	struct edid *edid;
	struct edid *edid;


	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
		      connector->base.id, drm_get_connector_name(connector));

	/* set the bus switch and get the modes */
	/* set the bus switch and get the modes */
	edid = intel_sdvo_get_edid(connector);
	edid = intel_sdvo_get_edid(connector);


@@ -1868,6 +1871,9 @@ static void intel_sdvo_get_tv_modes(struct drm_connector *connector)
	uint32_t reply = 0, format_map = 0;
	uint32_t reply = 0, format_map = 0;
	int i;
	int i;


	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
		      connector->base.id, drm_get_connector_name(connector));

	/* Read the list of supported input resolutions for the selected TV
	/* Read the list of supported input resolutions for the selected TV
	 * format.
	 * format.
	 */
	 */
@@ -1902,6 +1908,9 @@ static void intel_sdvo_get_lvds_modes(struct drm_connector *connector)
	struct drm_i915_private *dev_priv = connector->dev->dev_private;
	struct drm_i915_private *dev_priv = connector->dev->dev_private;
	struct drm_display_mode *newmode;
	struct drm_display_mode *newmode;


	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
		      connector->base.id, drm_get_connector_name(connector));

	/*
	/*
	 * Fetch modes from VBT. For SDVO prefer the VBT mode since some
	 * Fetch modes from VBT. For SDVO prefer the VBT mode since some
	 * SDVO->LVDS transcoders can't cope with the EDID mode.
	 * SDVO->LVDS transcoders can't cope with the EDID mode.
@@ -1933,7 +1942,6 @@ static void intel_sdvo_get_lvds_modes(struct drm_connector *connector)
			break;
			break;
		}
		}
	}
	}

}
}


static int intel_sdvo_get_modes(struct drm_connector *connector)
static int intel_sdvo_get_modes(struct drm_connector *connector)
@@ -2397,6 +2405,8 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
	struct intel_connector *intel_connector;
	struct intel_connector *intel_connector;
	struct intel_sdvo_connector *intel_sdvo_connector;
	struct intel_sdvo_connector *intel_sdvo_connector;


	DRM_DEBUG_KMS("initialising DVI device %d\n", device);

	intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
	intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
	if (!intel_sdvo_connector)
	if (!intel_sdvo_connector)
		return false;
		return false;
@@ -2445,6 +2455,8 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type)
	struct intel_connector *intel_connector;
	struct intel_connector *intel_connector;
	struct intel_sdvo_connector *intel_sdvo_connector;
	struct intel_sdvo_connector *intel_sdvo_connector;


	DRM_DEBUG_KMS("initialising TV type %d\n", type);

	intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
	intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
	if (!intel_sdvo_connector)
	if (!intel_sdvo_connector)
		return false;
		return false;
@@ -2482,6 +2494,8 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
	struct intel_connector *intel_connector;
	struct intel_connector *intel_connector;
	struct intel_sdvo_connector *intel_sdvo_connector;
	struct intel_sdvo_connector *intel_sdvo_connector;


	DRM_DEBUG_KMS("initialising analog device %d\n", device);

	intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
	intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
	if (!intel_sdvo_connector)
	if (!intel_sdvo_connector)
		return false;
		return false;
@@ -2513,6 +2527,8 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
	struct intel_connector *intel_connector;
	struct intel_connector *intel_connector;
	struct intel_sdvo_connector *intel_sdvo_connector;
	struct intel_sdvo_connector *intel_sdvo_connector;


	DRM_DEBUG_KMS("initialising LVDS device %d\n", device);

	intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
	intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
	if (!intel_sdvo_connector)
	if (!intel_sdvo_connector)
		return false;
		return false;