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

Commit 7f16c781 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dp: break aux transfer retry loop if timed-out"

parents 2cce8061 942fcac0

drivers/gpu/drm/msm/dp/dp_aux.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -515,6 +515,7 @@ static ssize_t dp_aux_transfer_debug(struct drm_dp_aux *drm_aux, 
			timeout = wait_for_completion_timeout(&aux->comp, HZ);

			timeout = wait_for_completion_timeout(&aux->comp, HZ);

			if (!timeout) {

			if (!timeout) {

				pr_err("aux timeout for 0x%x\n", msg->address);

				pr_err("aux timeout for 0x%x\n", msg->address);

				atomic_set(&aux->aborted, 1);

				ret = -ETIMEDOUT;

				ret = -ETIMEDOUT;

				goto end;

				goto end;

			}

			}
@@ -751,10 +752,12 @@ static void dp_aux_set_sim_mode(struct dp_aux *dp_aux, bool en, 
	aux->edid = edid;

	aux->edid = edid;

	aux->dpcd = dpcd;

	aux->dpcd = dpcd;





	if (en)

	if (en) {

		atomic_set(&aux->aborted, 0);

		aux->drm_aux.transfer = dp_aux_transfer_debug;

		aux->drm_aux.transfer = dp_aux_transfer_debug;

	else

	} else {

		aux->drm_aux.transfer = dp_aux_transfer;

		aux->drm_aux.transfer = dp_aux_transfer;

	}





	mutex_unlock(&aux->mutex);

	mutex_unlock(&aux->mutex);

}

}