drm/i915: print DP init debug messages from a single place
Subsystems (2)
PATCH 1/1 drm/i915: print DP init debug messages from a single place
Signed-off-by Imre Deak <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 12 +++--------- drivers/gpu/drm/i915/intel_dp.c | 4 ++++ 2 files changed, 7 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_display.c +3 -9
@@ -8828,10 +8828,8 @@ static void intel_setup_outputs(struct drm_device *dev)intel_hdmi_init (dev,GEN4_HDMIB ,PORT_B ); } -if (!found &&SUPPORTS_INTEGRATED_DP (dev)) { -DRM_DEBUG_KMS ("probing DP_B\n" ); +if (!found &&SUPPORTS_INTEGRATED_DP (dev))intel_dp_init (dev,DP_B ,PORT_B ); - } }/* Before G4X SDVOC doesn't have its own detect register */
@@ -8847,17 +8845,13 @@ static void intel_setup_outputs(struct drm_device *dev)DRM_DEBUG_KMS ("probing HDMI on SDVOC\n" );intel_hdmi_init (dev,GEN4_HDMIC ,PORT_C ); } -if (SUPPORTS_INTEGRATED_DP (dev)) { -DRM_DEBUG_KMS ("probing DP_C\n" ); +if (SUPPORTS_INTEGRATED_DP (dev))intel_dp_init (dev,DP_C ,PORT_C ); - } }if (SUPPORTS_INTEGRATED_DP (dev) && - (I915_READ (DP_D ) &DP_DETECTED )) { -DRM_DEBUG_KMS ("probing DP_D\n" ); + (I915_READ (DP_D ) &DP_DETECTED ))intel_dp_init (dev,DP_D ,PORT_D ); - } }else if (IS_GEN2 (dev))intel_dvo_init (dev);
drivers/gpu/drm/i915/intel_dp.c +4 -0
@@ -3007,6 +3007,10 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,if (type == DRM_MODE_CONNECTOR_eDP) intel_encoder->type =INTEL_OUTPUT_EDP ; +DRM_DEBUG_KMS ("Adding %s connector on port %c\n" , + type == DRM_MODE_CONNECTOR_eDP ?"eDP" :"DP" , +port_name (port)); +drm_connector_init (dev, connector, &intel_dp_connector_funcs, type);drm_connector_helper_add (connector, &intel_dp_connector_helper_funcs);
Signature · 1 line
1.7.10.4