Commit 2b5d1c29 authored by Ben Skeggs's avatar Ben Skeggs Committed by Karol Herbst
Browse files

drm/nouveau/disp: PIOR DP uses GPIO for HPD, not PMGR AUX interrupts 



Fixes crash on boards with ANX9805 TMDS/DP encoders.

Cc: stable@vger.kernel.org # 6.4+
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarKarol Herbst <kherbst@redhat.com>
Signed-off-by: default avatarKarol Herbst <kherbst@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230719044051.6975-2-skeggsb@gmail.com
parent 752a2810

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

+18 −9
Original line number Diff line number Diff line
@@ -81,7 +81,14 @@ nvkm_uconn_uevent(struct nvkm_object *object, void *argv, u32 argc, struct nvkm_ 
		return -ENOSYS;



	list_for_each_entry(outp, &conn->disp->outps, head) {

		if (outp->info.connector == conn->index && outp->dp.aux) {

		if (outp->info.connector == conn->index)

			break;

	}



	if (&outp->head == &conn->disp->outps)

		return -EINVAL;



	if (outp->dp.aux && !outp->info.location) {

		if (args->v0.types & NVIF_CONN_EVENT_V0_PLUG  ) bits |= NVKM_I2C_PLUG;

		if (args->v0.types & NVIF_CONN_EVENT_V0_UNPLUG) bits |= NVKM_I2C_UNPLUG;

		if (args->v0.types & NVIF_CONN_EVENT_V0_IRQ   ) bits |= NVKM_I2C_IRQ;
@@ -89,12 +96,14 @@ nvkm_uconn_uevent(struct nvkm_object *object, void *argv, u32 argc, struct nvkm_ 
		return nvkm_uevent_add(uevent, &device->i2c->event, outp->dp.aux->id, bits,

				       nvkm_uconn_uevent_aux);

	}

	}



	if (args->v0.types & NVIF_CONN_EVENT_V0_PLUG  ) bits |= NVKM_GPIO_HI;

	if (args->v0.types & NVIF_CONN_EVENT_V0_UNPLUG) bits |= NVKM_GPIO_LO;

	if (args->v0.types & NVIF_CONN_EVENT_V0_IRQ)

	if (args->v0.types & NVIF_CONN_EVENT_V0_IRQ) {

		/* TODO: support DP IRQ on ANX9805 and remove this hack. */

		if (!outp->info.location)

			return -EINVAL;

	}



	return nvkm_uevent_add(uevent, &device->gpio->event, conn->info.hpd, bits,

			       nvkm_uconn_uevent_gpio);