Commit 0df62823 authored by George Shen's avatar George Shen Committed by Alex Deucher
Browse files

drm/amd/display: Increase the number of retries after AUX DEFER 



[Why]
When a timeout occurs after a DEFER, some devices require more retries
than in the case of a regular timeout.

[How]
In a timeout occurrence, check whether a DEFER has occurred before the
timeout and retry MAX_DEFER_RETRIES retries times instead of
MAX_TIMEOUT_RETRIES.

Signed-off-by: default avatarGeorge Shen <george.shen@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarAbdoulaye Berthe <Abdoulaye.Berthe@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 44ce6c3d

drivers/gpu/drm/amd/display/dc/dce/dce_aux.c

+22 −10
Original line number Diff line number Diff line
@@ -583,6 +583,8 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc, 
	uint8_t reply;

	bool payload_reply = true;

	enum aux_channel_operation_result operation_result;

	bool retry_on_defer = false;



	int aux_ack_retries = 0,

		aux_defer_retries = 0,

		aux_i2c_defer_retries = 0,
@@ -613,8 +615,9 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc, 
			break;



			case AUX_TRANSACTION_REPLY_AUX_DEFER:

			case AUX_TRANSACTION_REPLY_I2C_OVER_AUX_NACK:

			case AUX_TRANSACTION_REPLY_I2C_OVER_AUX_DEFER:

				retry_on_defer = true;

			case AUX_TRANSACTION_REPLY_I2C_OVER_AUX_NACK:

				if (++aux_defer_retries >= AUX_MAX_DEFER_RETRIES) {

					goto fail;

				} else {
@@ -647,6 +650,14 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc, 
			break;



		case AUX_CHANNEL_OPERATION_FAILED_TIMEOUT:

			// Check whether a DEFER had occurred before the timeout.

			// If so, treat timeout as a DEFER.

			if (retry_on_defer) {

				if (++aux_defer_retries >= AUX_MAX_DEFER_RETRIES)

					goto fail;

				else if (payload->defer_delay > 0)

					msleep(payload->defer_delay);

			} else {

				if (++aux_timeout_retries >= AUX_MAX_TIMEOUT_RETRIES)

					goto fail;

				else {
@@ -657,6 +668,7 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc, 
					 * for 550us therefore no wait is required here.

					 */

				}

			}

			break;



		case AUX_CHANNEL_OPERATION_FAILED_HPD_DISCON:

CRA Git | Maintained and supported by SUSTech CRA and CCSE