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

Commit 1dda5f93 authored by Rodrigo Vivi's avatar Rodrigo Vivi Committed by Daniel Vetter
Browse files

drm/i915: make sink_crc return -EIO on aux read/write failure 



Even though it's unliky, we should check each aux transaction not just
the first one. Also

commit ce31d9f4
Author: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date:   Mon Sep 29 18:29:52 2014 -0400

    drm/i915: preserve other DP_TEST_SINK bits.

added a new aux transaction before the one which was checked. Fix
this.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Todd Previte <tprevite@gmail.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bd9f74a5

drivers/gpu/drm/i915/intel_dp.c

+13 −6
Original line number Diff line number Diff line
@@ -3875,16 +3875,21 @@ int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc) 
	if (!(buf & DP_TEST_CRC_SUPPORTED))

		return -ENOTTY;



	drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK, &buf);

	if (drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK, &buf) < 0)

		return -EIO;



	if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TEST_SINK,

				buf | DP_TEST_SINK_START) < 0)

		return -EIO;



	drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK_MISC, &buf);

	if (drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK_MISC, &buf) < 0)

		return -EIO;

	test_crc_count = buf & DP_TEST_COUNT_MASK;



	do {

		drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK_MISC, &buf);

		if (drm_dp_dpcd_readb(&intel_dp->aux,

				      DP_TEST_SINK_MISC, &buf) < 0)

			return -EIO;

		intel_wait_for_vblank(dev, intel_crtc->pipe);

	} while (--attempts && (buf & DP_TEST_COUNT_MASK) == test_crc_count);
@@ -3896,9 +3901,11 @@ int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc) 
	if (drm_dp_dpcd_read(&intel_dp->aux, DP_TEST_CRC_R_CR, crc, 6) < 0)

		return -EIO;



	drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK, &buf);

	drm_dp_dpcd_writeb(&intel_dp->aux, DP_TEST_SINK,

			buf & ~DP_TEST_SINK_START);

	if (drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK, &buf) < 0)

		return -EIO;

	if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TEST_SINK,

			       buf & ~DP_TEST_SINK_START) < 0)

		return -EIO;



	return 0;

}