mirror of
https://github.com/lkl/linux.git
synced 2025-12-18 23:53:03 +09:00
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: 2b5d1c29f6 ("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
214 lines
5.6 KiB
C
214 lines
5.6 KiB
C
/*
|
|
* Copyright 2021 Red Hat Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
#define nvkm_uconn(p) container_of((p), struct nvkm_conn, object)
|
|
#include "conn.h"
|
|
#include "outp.h"
|
|
|
|
#include <core/client.h>
|
|
#include <core/event.h>
|
|
#include <subdev/gpio.h>
|
|
#include <subdev/i2c.h>
|
|
|
|
#include <nvif/if0011.h>
|
|
|
|
static int
|
|
nvkm_uconn_uevent_aux(struct nvkm_object *object, u64 token, u32 bits)
|
|
{
|
|
union nvif_conn_event_args args;
|
|
|
|
args.v0.version = 0;
|
|
args.v0.types = 0;
|
|
if (bits & NVKM_I2C_PLUG)
|
|
args.v0.types |= NVIF_CONN_EVENT_V0_PLUG;
|
|
if (bits & NVKM_I2C_UNPLUG)
|
|
args.v0.types |= NVIF_CONN_EVENT_V0_UNPLUG;
|
|
if (bits & NVKM_I2C_IRQ)
|
|
args.v0.types |= NVIF_CONN_EVENT_V0_IRQ;
|
|
|
|
return object->client->event(token, &args, sizeof(args.v0));
|
|
}
|
|
|
|
static int
|
|
nvkm_uconn_uevent_gpio(struct nvkm_object *object, u64 token, u32 bits)
|
|
{
|
|
union nvif_conn_event_args args;
|
|
|
|
args.v0.version = 0;
|
|
args.v0.types = 0;
|
|
if (bits & NVKM_GPIO_HI)
|
|
args.v0.types |= NVIF_CONN_EVENT_V0_PLUG;
|
|
if (bits & NVKM_GPIO_LO)
|
|
args.v0.types |= NVIF_CONN_EVENT_V0_UNPLUG;
|
|
|
|
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)
|
|
{
|
|
struct nvkm_conn *conn = nvkm_uconn(object);
|
|
struct nvkm_device *device = conn->disp->engine.subdev.device;
|
|
struct nvkm_outp *outp;
|
|
union nvif_conn_event_args *args = argv;
|
|
u64 bits = 0;
|
|
|
|
if (!uevent) {
|
|
if (conn->info.hpd == DCB_GPIO_UNUSED)
|
|
return -ENOSYS;
|
|
return 0;
|
|
}
|
|
|
|
if (argc != sizeof(args->v0) || args->v0.version != 0)
|
|
return -ENOSYS;
|
|
|
|
list_for_each_entry(outp, &conn->disp->outps, head) {
|
|
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;
|
|
|
|
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) {
|
|
/* TODO: support DP IRQ on ANX9805 and remove this hack. */
|
|
if (!outp->info.location && !nvkm_connector_is_dp_dms(conn->info.type))
|
|
return -EINVAL;
|
|
}
|
|
|
|
return nvkm_uevent_add(uevent, &device->gpio->event, conn->info.hpd, bits,
|
|
nvkm_uconn_uevent_gpio);
|
|
}
|
|
|
|
static int
|
|
nvkm_uconn_mthd_hpd_status(struct nvkm_conn *conn, void *argv, u32 argc)
|
|
{
|
|
struct nvkm_gpio *gpio = conn->disp->engine.subdev.device->gpio;
|
|
union nvif_conn_hpd_status_args *args = argv;
|
|
|
|
if (argc != sizeof(args->v0) || args->v0.version != 0)
|
|
return -ENOSYS;
|
|
|
|
args->v0.support = gpio && conn->info.hpd != DCB_GPIO_UNUSED;
|
|
args->v0.present = 0;
|
|
|
|
if (args->v0.support) {
|
|
int ret = nvkm_gpio_get(gpio, 0, DCB_GPIO_UNUSED, conn->info.hpd);
|
|
|
|
if (WARN_ON(ret < 0)) {
|
|
args->v0.support = false;
|
|
return 0;
|
|
}
|
|
|
|
args->v0.present = ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
nvkm_uconn_mthd(struct nvkm_object *object, u32 mthd, void *argv, u32 argc)
|
|
{
|
|
struct nvkm_conn *conn = nvkm_uconn(object);
|
|
|
|
switch (mthd) {
|
|
case NVIF_CONN_V0_HPD_STATUS: return nvkm_uconn_mthd_hpd_status(conn, argv, argc);
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return -EINVAL;
|
|
}
|
|
|
|
static void *
|
|
nvkm_uconn_dtor(struct nvkm_object *object)
|
|
{
|
|
struct nvkm_conn *conn = nvkm_uconn(object);
|
|
struct nvkm_disp *disp = conn->disp;
|
|
|
|
spin_lock(&disp->client.lock);
|
|
conn->object.func = NULL;
|
|
spin_unlock(&disp->client.lock);
|
|
return NULL;
|
|
}
|
|
|
|
static const struct nvkm_object_func
|
|
nvkm_uconn = {
|
|
.dtor = nvkm_uconn_dtor,
|
|
.mthd = nvkm_uconn_mthd,
|
|
.uevent = nvkm_uconn_uevent,
|
|
};
|
|
|
|
int
|
|
nvkm_uconn_new(const struct nvkm_oclass *oclass, void *argv, u32 argc, struct nvkm_object **pobject)
|
|
{
|
|
struct nvkm_disp *disp = nvkm_udisp(oclass->parent);
|
|
struct nvkm_conn *cont, *conn = NULL;
|
|
union nvif_conn_args *args = argv;
|
|
int ret;
|
|
|
|
if (argc != sizeof(args->v0) || args->v0.version != 0)
|
|
return -ENOSYS;
|
|
|
|
list_for_each_entry(cont, &disp->conns, head) {
|
|
if (cont->index == args->v0.id) {
|
|
conn = cont;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (!conn)
|
|
return -EINVAL;
|
|
|
|
ret = -EBUSY;
|
|
spin_lock(&disp->client.lock);
|
|
if (!conn->object.func) {
|
|
nvkm_object_ctor(&nvkm_uconn, oclass, &conn->object);
|
|
*pobject = &conn->object;
|
|
ret = 0;
|
|
}
|
|
spin_unlock(&disp->client.lock);
|
|
return ret;
|
|
}
|