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

Commit 4a62cac0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: dp: add timeout state for simulated AUX transfers"

parents bbd3e2b1 d532f145

msm/dp/dp_aux.c

+4 −2
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ static ssize_t dp_aux_transfer_debug(struct drm_dp_aux *drm_aux, 
		if (aux->read) {

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

			if (!timeout) {

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

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

				atomic_set(&aux->aborted, 1);

				ret = -ETIMEDOUT;

				goto end;
@@ -519,7 +519,7 @@ static ssize_t dp_aux_transfer_debug(struct drm_dp_aux *drm_aux, 


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

			if (!timeout) {

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

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

				atomic_set(&aux->aborted, 1);

				ret = -ETIMEDOUT;

				goto end;
@@ -556,6 +556,8 @@ static ssize_t dp_aux_transfer_debug(struct drm_dp_aux *drm_aux, 
	memset(msg->buffer, 0, msg->size);

	ret = msg->size;

end:

	if (ret == -ETIMEDOUT)

		aux->dp_aux.state |= DP_STATE_AUX_TIMEOUT;

	aux->dp_aux.reg = 0xFFFF;

	aux->dp_aux.read = true;

	aux->dp_aux.size = 0;

msm/dp/dp_aux.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#define DP_STATE_LINK_MAINTENANCE_STARTED   BIT(9)

#define DP_STATE_LINK_MAINTENANCE_COMPLETED BIT(10)

#define DP_STATE_LINK_MAINTENANCE_FAILED    BIT(11)

#define DP_STATE_AUX_TIMEOUT                BIT(12)



enum dp_aux_error {

	DP_AUX_ERR_NONE	= 0,