Commit 9776c0a7 authored by Dave Airlie's avatar Dave Airlie
Browse files

nouveau/dp: handle retries for AUX CH transfers with GSP. 



eb284f4b drm/nouveau/dp: Honor GSP link training retry timeouts

tried to fix a problem with panel retires, however it appears
the auxch also needs the same treatment, so add the same retry
wrapper around it.

This fixes some eDP panels after a suspend/resume cycle.

Fixes: eb284f4b ("drm/nouveau/dp: Honor GSP link training retry timeouts")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241111034126.2028401-2-airlied@gmail.com
parent b6ad7deb

drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c

+34 −23
Original line number Diff line number Diff line
@@ -1060,7 +1060,9 @@ r535_dp_aux_xfer(struct nvkm_outp *outp, u8 type, u32 addr, u8 *data, u8 *psize) 
	NV0073_CTRL_DP_AUXCH_CTRL_PARAMS *ctrl;

	u8 size = *psize;

	int ret;

	int retries;



	for (retries = 0; retries < 3; ++retries) {

		ctrl = nvkm_gsp_rm_ctrl_get(&disp->rm.objcom, NV0073_CTRL_CMD_DP_AUXCH_CTRL, sizeof(*ctrl));

		if (IS_ERR(ctrl))

			return PTR_ERR(ctrl);
@@ -1078,15 +1080,24 @@ r535_dp_aux_xfer(struct nvkm_outp *outp, u8 type, u32 addr, u8 *data, u8 *psize) 
		memcpy(ctrl->data, data, size);



		ret = nvkm_gsp_rm_ctrl_push(&disp->rm.objcom, &ctrl, sizeof(*ctrl));

	if (ret) {

		if ((ret == -EAGAIN || ret == -EBUSY) && ctrl->retryTimeMs) {

			/*

			 * Device (likely an eDP panel) isn't ready yet, wait for the time specified

			 * by GSP before retrying again

			 */

			nvkm_debug(&disp->engine.subdev,

				   "Waiting %dms for GSP LT panel delay before retrying in AUX\n",

				   ctrl->retryTimeMs);

			msleep(ctrl->retryTimeMs);

			nvkm_gsp_rm_ctrl_done(&disp->rm.objcom, ctrl);

		return ret;

	}



		} else {

			memcpy(data, ctrl->data, size);

			*psize = ctrl->size;

			ret = ctrl->replyType;

			nvkm_gsp_rm_ctrl_done(&disp->rm.objcom, ctrl);

			break;

		}

	}

	return ret;

}