Commit 4366faf4 authored by Karol Herbst's avatar Karol Herbst
Browse files

drm/nouveau/disp: fix DP capable DSM connectors 

Just special case DP DSM connectors until we properly figure out how to
deal with this.

This resolves user regressions on GPUs with such connectors without
reverting the original fix.

Cc: Lyude Paul <lyude@redhat.com>
Cc: stable@vger.kernel.org # 6.4+
Closes: https://gitlab.freedesktop.org/drm/nouveau/-/issues/255


Fixes: 2b5d1c29 ("drm/nouveau/disp: PIOR DP uses GPIO for HPD, not PMGR AUX interrupts")
Signed-off-by: default avatarKarol Herbst <kherbst@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231011114134.861818-1-kherbst@redhat.com
parent f2cab4b3

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

+13 −1
Original line number Diff line number Diff line
@@ -62,6 +62,18 @@ nvkm_uconn_uevent_gpio(struct nvkm_object *object, u64 token, u32 bits) 
	return object->client->event(token, &args, sizeof(args.v0));

}



static bool

nvkm_connector_is_dp_dms(u8 type)

{

	switch (type) {

	case DCB_CONNECTOR_DMS59_DP0:

	case DCB_CONNECTOR_DMS59_DP1:

		return true;

	default:

		return false;

	}

}



static int

nvkm_uconn_uevent(struct nvkm_object *object, void *argv, u32 argc, struct nvkm_uevent *uevent)

{
@@ -101,7 +113,7 @@ nvkm_uconn_uevent(struct nvkm_object *object, void *argv, u32 argc, struct nvkm_ 
	if (args->v0.types & NVIF_CONN_EVENT_V0_UNPLUG) bits |= NVKM_GPIO_LO;

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

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

		if (!outp->info.location)

		if (!outp->info.location && !nvkm_connector_is_dp_dms(conn->info.type))

			return -EINVAL;

	}