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

Commit e7281eab authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: print DP init debug messages from a single place 



Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 15e6bf74

drivers/gpu/drm/i915/intel_display.c

+3 −9
Original line number Diff line number Diff line
@@ -8821,11 +8821,9 @@ 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 */
@@ -8840,17 +8838,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
Original line number Diff line number Diff line
@@ -2978,6 +2978,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);