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

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

drm/i915: Try to stop sink crc calculation on error. 



Right now if we face any kind of error sink crc calculation
stays enabled.

So, let's give a shot and try to stop it anyway if it got enabled.

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarRafael Antognolli <rafael.antognolli@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6c246959

drivers/gpu/drm/i915/intel_dp.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -3994,7 +3994,7 @@ int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc) 




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

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

		ret = -EIO;

		ret = -EIO;

		goto out;

		goto stop;

	}

	}





	test_crc_count = buf & DP_TEST_COUNT_MASK;

	test_crc_count = buf & DP_TEST_COUNT_MASK;
@@ -4003,7 +4003,7 @@ int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc) 
		if (drm_dp_dpcd_readb(&intel_dp->aux,

		if (drm_dp_dpcd_readb(&intel_dp->aux,

				      DP_TEST_SINK_MISC, &buf) < 0) {

				      DP_TEST_SINK_MISC, &buf) < 0) {

			ret = -EIO;

			ret = -EIO;

			goto out;

			goto stop;

		}

		}

		intel_wait_for_vblank(dev, intel_crtc->pipe);

		intel_wait_for_vblank(dev, intel_crtc->pipe);

	} while (--attempts && (buf & DP_TEST_COUNT_MASK) == test_crc_count);

	} while (--attempts && (buf & DP_TEST_COUNT_MASK) == test_crc_count);
@@ -4011,14 +4011,15 @@ int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc) 
	if (attempts == 0) {

	if (attempts == 0) {

		DRM_DEBUG_KMS("Panel is unable to calculate CRC after 6 vblanks\n");

		DRM_DEBUG_KMS("Panel is unable to calculate CRC after 6 vblanks\n");

		ret = -ETIMEDOUT;

		ret = -ETIMEDOUT;

		goto out;

		goto stop;

	}

	}





	if (drm_dp_dpcd_read(&intel_dp->aux, DP_TEST_CRC_R_CR, crc, 6) < 0) {

	if (drm_dp_dpcd_read(&intel_dp->aux, DP_TEST_CRC_R_CR, crc, 6) < 0) {

		ret = -EIO;

		ret = -EIO;

		goto out;

		goto stop;

	}

	}





stop:

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

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

		ret = -EIO;

		ret = -EIO;

		goto out;

		goto out;