drm/nouveau/disp: fix DP capable DSM connectors
authorKarol Herbst <kherbst@redhat.com>
Wed, 11 Oct 2023 11:41:34 +0000 (13:41 +0200)
committerKarol Herbst <kherbst@redhat.com>
Thu, 12 Oct 2023 20:47:08 +0000 (22:47 +0200)
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: 2b5d1c29f6c4 ("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
drivers/gpu/drm/nouveau/nvkm/engine/disp/uconn.c

index 46b057fe1412ece4bd4fabaa9bca136260ef8dfe..3249e5c1c89308dd7a9d4a12a4c48bcf29479af9 100644 (file)
@@ -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;
        }