Skip to content

Commit 4366faf

Browse files
committed
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: 2b5d1c2 ("drm/nouveau/disp: PIOR DP uses GPIO for HPD, not PMGR AUX interrupts") Signed-off-by: Karol Herbst <kherbst@redhat.com> Reviewed-by: Lyude Paul <lyude@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231011114134.861818-1-kherbst@redhat.com
1 parent f2cab4b commit 4366faf

File tree

1 file changed

+13
-1
lines changed
  • drivers/gpu/drm/nouveau/nvkm/engine/disp

1 file changed

+13
-1
lines changed

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,18 @@ nvkm_uconn_uevent_gpio(struct nvkm_object *object, u64 token, u32 bits)
6262
return object->client->event(token, &args, sizeof(args.v0));
6363
}
6464

65+
static bool
66+
nvkm_connector_is_dp_dms(u8 type)
67+
{
68+
switch (type) {
69+
case DCB_CONNECTOR_DMS59_DP0:
70+
case DCB_CONNECTOR_DMS59_DP1:
71+
return true;
72+
default:
73+
return false;
74+
}
75+
}
76+
6577
static int
6678
nvkm_uconn_uevent(struct nvkm_object *object, void *argv, u32 argc, struct nvkm_uevent *uevent)
6779
{
@@ -101,7 +113,7 @@ nvkm_uconn_uevent(struct nvkm_object *object, void *argv, u32 argc, struct nvkm_
101113
if (args->v0.types & NVIF_CONN_EVENT_V0_UNPLUG) bits |= NVKM_GPIO_LO;
102114
if (args->v0.types & NVIF_CONN_EVENT_V0_IRQ) {
103115
/* TODO: support DP IRQ on ANX9805 and remove this hack. */
104-
if (!outp->info.location)
116+
if (!outp->info.location && !nvkm_connector_is_dp_dms(conn->info.type))
105117
return -EINVAL;
106118
}
107119

0 commit comments

Comments
 (0)