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

Commit 577c7a50 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915/dp: Log the DPCD only if we have successfully retrieved one 



Moving the DPCD just after a successful read will allow to:
  - log all DPCD reads (eDP ones, changes signalled by HPD IRQ)
  - don't log it if we haven't been able to read it

v2: Be sure to log the DPCD when a downstream port does not have HPD
    support and the branch device asserts HPD (Jani Nikula)

Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1b469639

drivers/gpu/drm/i915/intel_dp.c

+6 −5
Original line number Diff line number Diff line
@@ -2084,10 +2084,16 @@ intel_dp_link_down(struct intel_dp *intel_dp) 
static bool

intel_dp_get_dpcd(struct intel_dp *intel_dp)

{

	char dpcd_hex_dump[sizeof(intel_dp->dpcd) * 3];



	if (intel_dp_aux_native_read_retry(intel_dp, 0x000, intel_dp->dpcd,

					   sizeof(intel_dp->dpcd)) == 0)

		return false; /* aux transfer failed */



	hex_dump_to_buffer(intel_dp->dpcd, sizeof(intel_dp->dpcd),

			   32, 1, dpcd_hex_dump, sizeof(dpcd_hex_dump), false);

	DRM_DEBUG_KMS("DPCD: %s\n", dpcd_hex_dump);



	if (intel_dp->dpcd[DP_DPCD_REV] == 0)

		return false; /* DPCD not present */
@@ -2353,7 +2359,6 @@ intel_dp_detect(struct drm_connector *connector, bool force) 
	struct drm_device *dev = connector->dev;

	enum drm_connector_status status;

	struct edid *edid = NULL;

	char dpcd_hex_dump[sizeof(intel_dp->dpcd) * 3];



	intel_dp->has_audio = false;
@@ -2362,10 +2367,6 @@ intel_dp_detect(struct drm_connector *connector, bool force) 
	else

		status = g4x_dp_detect(intel_dp);



	hex_dump_to_buffer(intel_dp->dpcd, sizeof(intel_dp->dpcd),

			   32, 1, dpcd_hex_dump, sizeof(dpcd_hex_dump), false);

	DRM_DEBUG_KMS("DPCD: %s\n", dpcd_hex_dump);



	if (status != connector_status_connected)

		return status;