aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-09-24 07:55:40 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-10-01 01:45:14 -0400
commit46a3f4a3148684f9210767784a017314876c3274 (patch)
tree71f25c5f8a666a832becd6d2987bc34119caea29
parentaec347ab197ec064d1e98b52717d968521a62929 (diff)
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: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_sdvo.c20
1 files changed, 18 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index d8040e8a68b5..606e03279201 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -539,7 +539,7 @@ static bool intel_sdvo_read_response(struct intel_sdvo *intel_sdvo,
539 goto log_fail; 539 goto log_fail;
540 540
541 while ((status == SDVO_CMD_STATUS_PENDING || 541 while ((status == SDVO_CMD_STATUS_PENDING ||
542 status == SDVO_CMD_STATUS_TARGET_NOT_SPECIFIED) && --retry) { 542 status == SDVO_CMD_STATUS_TARGET_NOT_SPECIFIED) && --retry) {
543 if (retry < 10) 543 if (retry < 10)
544 msleep(15); 544 msleep(15);
545 else 545 else
@@ -1773,6 +1773,9 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
1773{ 1773{
1774 struct edid *edid; 1774 struct edid *edid;
1775 1775
1776 DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
1777 connector->base.id, drm_get_connector_name(connector));
1778
1776 /* set the bus switch and get the modes */ 1779 /* set the bus switch and get the modes */
1777 edid = intel_sdvo_get_edid(connector); 1780 edid = intel_sdvo_get_edid(connector);
1778 1781
@@ -1868,6 +1871,9 @@ static void intel_sdvo_get_tv_modes(struct drm_connector *connector)
1868 uint32_t reply = 0, format_map = 0; 1871 uint32_t reply = 0, format_map = 0;
1869 int i; 1872 int i;
1870 1873
1874 DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
1875 connector->base.id, drm_get_connector_name(connector));
1876
1871 /* Read the list of supported input resolutions for the selected TV 1877 /* Read the list of supported input resolutions for the selected TV
1872 * format. 1878 * format.
1873 */ 1879 */
@@ -1902,6 +1908,9 @@ static void intel_sdvo_get_lvds_modes(struct drm_connector *connector)
1902 struct drm_i915_private *dev_priv = connector->dev->dev_private; 1908 struct drm_i915_private *dev_priv = connector->dev->dev_private;
1903 struct drm_display_mode *newmode; 1909 struct drm_display_mode *newmode;
1904 1910
1911 DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
1912 connector->base.id, drm_get_connector_name(connector));
1913
1905 /* 1914 /*
1906 * Fetch modes from VBT. For SDVO prefer the VBT mode since some 1915 * Fetch modes from VBT. For SDVO prefer the VBT mode since some
1907 * SDVO->LVDS transcoders can't cope with the EDID mode. 1916 * 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)
1933 break; 1942 break;
1934 } 1943 }
1935 } 1944 }
1936
1937} 1945}
1938 1946
1939static int intel_sdvo_get_modes(struct drm_connector *connector) 1947static int intel_sdvo_get_modes(struct drm_connector *connector)
@@ -2397,6 +2405,8 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
2397 struct intel_connector *intel_connector; 2405 struct intel_connector *intel_connector;
2398 struct intel_sdvo_connector *intel_sdvo_connector; 2406 struct intel_sdvo_connector *intel_sdvo_connector;
2399 2407
2408 DRM_DEBUG_KMS("initialising DVI device %d\n", device);
2409
2400 intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL); 2410 intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
2401 if (!intel_sdvo_connector) 2411 if (!intel_sdvo_connector)
2402 return false; 2412 return false;
@@ -2445,6 +2455,8 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type)
2445 struct intel_connector *intel_connector; 2455 struct intel_connector *intel_connector;
2446 struct intel_sdvo_connector *intel_sdvo_connector; 2456 struct intel_sdvo_connector *intel_sdvo_connector;
2447 2457
2458 DRM_DEBUG_KMS("initialising TV type %d\n", type);
2459
2448 intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL); 2460 intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
2449 if (!intel_sdvo_connector) 2461 if (!intel_sdvo_connector)
2450 return false; 2462 return false;
@@ -2482,6 +2494,8 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
2482 struct intel_connector *intel_connector; 2494 struct intel_connector *intel_connector;
2483 struct intel_sdvo_connector *intel_sdvo_connector; 2495 struct intel_sdvo_connector *intel_sdvo_connector;
2484 2496
2497 DRM_DEBUG_KMS("initialising analog device %d\n", device);
2498
2485 intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL); 2499 intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
2486 if (!intel_sdvo_connector) 2500 if (!intel_sdvo_connector)
2487 return false; 2501 return false;
@@ -2513,6 +2527,8 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
2513 struct intel_connector *intel_connector; 2527 struct intel_connector *intel_connector;
2514 struct intel_sdvo_connector *intel_sdvo_connector; 2528 struct intel_sdvo_connector *intel_sdvo_connector;
2515 2529
2530 DRM_DEBUG_KMS("initialising LVDS device %d\n", device);
2531
2516 intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL); 2532 intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
2517 if (!intel_sdvo_connector) 2533 if (!intel_sdvo_connector)
2518 return false; 2534 return false;