* [Nouveau] [PATCH AUTOSEL 4.14 5/7] drm/nouveau/disp: power down unused DP links during init [not found] <20210824005528.631702-1-sashal@kernel.org> @ 2021-08-24 0:55 ` Sasha Levin 2021-08-24 0:55 ` [Nouveau] [PATCH AUTOSEL 4.14 6/7] drm/nouveau: block a bunch of classes from userspace Sasha Levin 1 sibling, 0 replies; 4+ messages in thread From: Sasha Levin @ 2021-08-24 0:55 UTC (permalink / raw) To: linux-kernel, stable Cc: Ben Skeggs, Lyude Paul, Sasha Levin, dri-devel, nouveau From: Ben Skeggs <bskeggs@redhat.com> [ Upstream commit 6eaa1f3c59a707332e921e32782ffcad49915c5e ] When booted with multiple displays attached, the EFI GOP driver on (at least) Ampere, can leave DP links powered up that aren't being used to display anything. This confuses our tracking of SOR routing, with the likely result being a failed modeset and display engine hang. Fix this by (ab?)using the DisableLT IED script to power-down the link, restoring HW to a state the driver expects. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Reviewed-by: Lyude Paul <lyude@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h | 1 + drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c index 5e51a5c1eb01..d11cb1f887f7 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c @@ -418,7 +418,7 @@ nvkm_dp_train(struct nvkm_dp *dp, u32 dataKBps) return ret; } -static void +void nvkm_dp_disable(struct nvkm_outp *outp, struct nvkm_ior *ior) { struct nvkm_dp *dp = nvkm_dp(outp); diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h index 495f665a0ee6..12d6ff4cfa95 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h @@ -32,6 +32,7 @@ struct nvkm_dp { int nvkm_dp_new(struct nvkm_disp *, int index, struct dcb_output *, struct nvkm_outp **); +void nvkm_dp_disable(struct nvkm_outp *, struct nvkm_ior *); /* DPCD Receiver Capabilities */ #define DPCD_RC00_DPCD_REV 0x00000 diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c index bbba77ff9385..81c0f0513c74 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c @@ -22,6 +22,7 @@ * Authors: Ben Skeggs */ #include "outp.h" +#include "dp.h" #include "ior.h" #include <subdev/bios.h> @@ -207,6 +208,14 @@ nvkm_outp_init_route(struct nvkm_outp *outp) if (!ior->arm.head || ior->arm.proto != proto) { OUTP_DBG(outp, "no heads (%x %d %d)", ior->arm.head, ior->arm.proto, proto); + + /* The EFI GOP driver on Ampere can leave unused DP links routed, + * which we don't expect. The DisableLT IED script *should* get + * us back to where we need to be. + */ + if (ior->func->route.get && !ior->arm.head && outp->info.type == DCB_OUTPUT_DP) + nvkm_dp_disable(outp, ior); + return; } -- 2.30.2 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Nouveau] [PATCH AUTOSEL 4.14 6/7] drm/nouveau: block a bunch of classes from userspace [not found] <20210824005528.631702-1-sashal@kernel.org> 2021-08-24 0:55 ` [Nouveau] [PATCH AUTOSEL 4.14 5/7] drm/nouveau/disp: power down unused DP links during init Sasha Levin @ 2021-08-24 0:55 ` Sasha Levin 2021-08-24 17:05 ` Lyude Paul 1 sibling, 1 reply; 4+ messages in thread From: Sasha Levin @ 2021-08-24 0:55 UTC (permalink / raw) To: linux-kernel, stable Cc: Ben Skeggs, Lyude Paul, Sasha Levin, dri-devel, nouveau From: Ben Skeggs <bskeggs@redhat.com> [ Upstream commit 148a8653789c01f159764ffcc3f370008966b42f ] Long ago, there had been plans for making use of a bunch of these APIs from userspace and there's various checks in place to stop misbehaving. Countless other projects have occurred in the meantime, and the pieces didn't finish falling into place for that to happen. They will (hopefully) in the not-too-distant future, but it won't look quite as insane. The super checks are causing problems right now, and are going to be removed. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Reviewed-by: Lyude Paul <lyude@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/gpu/drm/nouveau/include/nvif/cl0080.h | 3 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 1 + drivers/gpu/drm/nouveau/nouveau_usif.c | 57 ++++++++++++++----- .../gpu/drm/nouveau/nvkm/engine/device/user.c | 2 +- 4 files changed, 48 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl0080.h b/drivers/gpu/drm/nouveau/include/nvif/cl0080.h index 2740278d226b..61c17acd507c 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl0080.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl0080.h @@ -4,7 +4,8 @@ struct nv_device_v0 { __u8 version; - __u8 pad01[7]; + __u8 priv; + __u8 pad02[6]; __u64 device; /* device identifier, ~0 for client default */ }; diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index fb6b1d0f7fef..fc54a26598cc 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -151,6 +151,7 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *sname, ret = nvif_device_init(&cli->base.object, 0, NV_DEVICE, &(struct nv_device_v0) { .device = ~0, + .priv = true, }, sizeof(struct nv_device_v0), &cli->device); if (ret) { diff --git a/drivers/gpu/drm/nouveau/nouveau_usif.c b/drivers/gpu/drm/nouveau/nouveau_usif.c index 9dc10b17ad34..5da1f4d223d7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_usif.c +++ b/drivers/gpu/drm/nouveau/nouveau_usif.c @@ -32,6 +32,9 @@ #include <nvif/event.h> #include <nvif/ioctl.h> +#include <nvif/class.h> +#include <nvif/cl0080.h> + struct usif_notify_p { struct drm_pending_event base; struct { @@ -261,7 +264,7 @@ usif_object_dtor(struct usif_object *object) } static int -usif_object_new(struct drm_file *f, void *data, u32 size, void *argv, u32 argc) +usif_object_new(struct drm_file *f, void *data, u32 size, void *argv, u32 argc, bool parent_abi16) { struct nouveau_cli *cli = nouveau_cli(f); struct nvif_client *client = &cli->base; @@ -271,23 +274,48 @@ usif_object_new(struct drm_file *f, void *data, u32 size, void *argv, u32 argc) struct usif_object *object; int ret = -ENOSYS; + if ((ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) + return ret; + + switch (args->v0.oclass) { + case NV_DMA_FROM_MEMORY: + case NV_DMA_TO_MEMORY: + case NV_DMA_IN_MEMORY: + return -EINVAL; + case NV_DEVICE: { + union { + struct nv_device_v0 v0; + } *args = data; + + if ((ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) + return ret; + + args->v0.priv = false; + break; + } + default: + if (!parent_abi16) + return -EINVAL; + break; + } + if (!(object = kmalloc(sizeof(*object), GFP_KERNEL))) return -ENOMEM; list_add(&object->head, &cli->objects); - if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) { - object->route = args->v0.route; - object->token = args->v0.token; - args->v0.route = NVDRM_OBJECT_USIF; - args->v0.token = (unsigned long)(void *)object; - ret = nvif_client_ioctl(client, argv, argc); - args->v0.token = object->token; - args->v0.route = object->route; + object->route = args->v0.route; + object->token = args->v0.token; + args->v0.route = NVDRM_OBJECT_USIF; + args->v0.token = (unsigned long)(void *)object; + ret = nvif_client_ioctl(client, argv, argc); + if (ret) { + usif_object_dtor(object); + return ret; } - if (ret) - usif_object_dtor(object); - return ret; + args->v0.token = object->token; + args->v0.route = object->route; + return 0; } int @@ -301,6 +329,7 @@ usif_ioctl(struct drm_file *filp, void __user *user, u32 argc) struct nvif_ioctl_v0 v0; } *argv = data; struct usif_object *object; + bool abi16 = false; u8 owner; int ret; @@ -331,11 +360,13 @@ usif_ioctl(struct drm_file *filp, void __user *user, u32 argc) mutex_unlock(&cli->mutex); goto done; } + + abi16 = true; } switch (argv->v0.type) { case NVIF_IOCTL_V0_NEW: - ret = usif_object_new(filp, data, size, argv, argc); + ret = usif_object_new(filp, data, size, argv, argc, abi16); break; case NVIF_IOCTL_V0_NTFY_NEW: ret = usif_notify_new(filp, data, size, argv, argc); diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c index 513ee6b79553..08100eed9584 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c @@ -347,7 +347,7 @@ nvkm_udevice_new(const struct nvkm_oclass *oclass, void *data, u32 size, return ret; /* give priviledged clients register access */ - if (client->super) + if (args->v0.priv) func = &nvkm_udevice_super; else func = &nvkm_udevice; -- 2.30.2 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Nouveau] [PATCH AUTOSEL 4.14 6/7] drm/nouveau: block a bunch of classes from userspace 2021-08-24 0:55 ` [Nouveau] [PATCH AUTOSEL 4.14 6/7] drm/nouveau: block a bunch of classes from userspace Sasha Levin @ 2021-08-24 17:05 ` Lyude Paul 2021-08-30 12:17 ` Sasha Levin 0 siblings, 1 reply; 4+ messages in thread From: Lyude Paul @ 2021-08-24 17:05 UTC (permalink / raw) To: Sasha Levin, linux-kernel, stable; +Cc: Ben Skeggs, dri-devel, nouveau This isn't at all intended to be a fix to be backported, so I don't think this should be included. I don't know about 5/7, but I'll let Benjamin comment on that one On Mon, 2021-08-23 at 20:55 -0400, Sasha Levin wrote: > From: Ben Skeggs <bskeggs@redhat.com> > > [ Upstream commit 148a8653789c01f159764ffcc3f370008966b42f ] > > Long ago, there had been plans for making use of a bunch of these APIs > from userspace and there's various checks in place to stop misbehaving. > > Countless other projects have occurred in the meantime, and the pieces > didn't finish falling into place for that to happen. > > They will (hopefully) in the not-too-distant future, but it won't look > quite as insane. The super checks are causing problems right now, and > are going to be removed. > > Signed-off-by: Ben Skeggs <bskeggs@redhat.com> > Reviewed-by: Lyude Paul <lyude@redhat.com> > Signed-off-by: Sasha Levin <sashal@kernel.org> > --- > drivers/gpu/drm/nouveau/include/nvif/cl0080.h | 3 +- > drivers/gpu/drm/nouveau/nouveau_drm.c | 1 + > drivers/gpu/drm/nouveau/nouveau_usif.c | 57 ++++++++++++++----- > .../gpu/drm/nouveau/nvkm/engine/device/user.c | 2 +- > 4 files changed, 48 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl0080.h > b/drivers/gpu/drm/nouveau/include/nvif/cl0080.h > index 2740278d226b..61c17acd507c 100644 > --- a/drivers/gpu/drm/nouveau/include/nvif/cl0080.h > +++ b/drivers/gpu/drm/nouveau/include/nvif/cl0080.h > @@ -4,7 +4,8 @@ > > struct nv_device_v0 { > __u8 version; > - __u8 pad01[7]; > + __u8 priv; > + __u8 pad02[6]; > __u64 device; /* device identifier, ~0 for client default */ > }; > > diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c > b/drivers/gpu/drm/nouveau/nouveau_drm.c > index fb6b1d0f7fef..fc54a26598cc 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_drm.c > +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c > @@ -151,6 +151,7 @@ nouveau_cli_init(struct nouveau_drm *drm, const char > *sname, > ret = nvif_device_init(&cli->base.object, 0, NV_DEVICE, > &(struct nv_device_v0) { > .device = ~0, > + .priv = true, > }, sizeof(struct nv_device_v0), > &cli->device); > if (ret) { > diff --git a/drivers/gpu/drm/nouveau/nouveau_usif.c > b/drivers/gpu/drm/nouveau/nouveau_usif.c > index 9dc10b17ad34..5da1f4d223d7 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_usif.c > +++ b/drivers/gpu/drm/nouveau/nouveau_usif.c > @@ -32,6 +32,9 @@ > #include <nvif/event.h> > #include <nvif/ioctl.h> > > +#include <nvif/class.h> > +#include <nvif/cl0080.h> > + > struct usif_notify_p { > struct drm_pending_event base; > struct { > @@ -261,7 +264,7 @@ usif_object_dtor(struct usif_object *object) > } > > static int > -usif_object_new(struct drm_file *f, void *data, u32 size, void *argv, u32 > argc) > +usif_object_new(struct drm_file *f, void *data, u32 size, void *argv, u32 > argc, bool parent_abi16) > { > struct nouveau_cli *cli = nouveau_cli(f); > struct nvif_client *client = &cli->base; > @@ -271,23 +274,48 @@ usif_object_new(struct drm_file *f, void *data, u32 > size, void *argv, u32 argc) > struct usif_object *object; > int ret = -ENOSYS; > > + if ((ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) > + return ret; > + > + switch (args->v0.oclass) { > + case NV_DMA_FROM_MEMORY: > + case NV_DMA_TO_MEMORY: > + case NV_DMA_IN_MEMORY: > + return -EINVAL; > + case NV_DEVICE: { > + union { > + struct nv_device_v0 v0; > + } *args = data; > + > + if ((ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, > false))) > + return ret; > + > + args->v0.priv = false; > + break; > + } > + default: > + if (!parent_abi16) > + return -EINVAL; > + break; > + } > + > if (!(object = kmalloc(sizeof(*object), GFP_KERNEL))) > return -ENOMEM; > list_add(&object->head, &cli->objects); > > - if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) { > - object->route = args->v0.route; > - object->token = args->v0.token; > - args->v0.route = NVDRM_OBJECT_USIF; > - args->v0.token = (unsigned long)(void *)object; > - ret = nvif_client_ioctl(client, argv, argc); > - args->v0.token = object->token; > - args->v0.route = object->route; > + object->route = args->v0.route; > + object->token = args->v0.token; > + args->v0.route = NVDRM_OBJECT_USIF; > + args->v0.token = (unsigned long)(void *)object; > + ret = nvif_client_ioctl(client, argv, argc); > + if (ret) { > + usif_object_dtor(object); > + return ret; > } > > - if (ret) > - usif_object_dtor(object); > - return ret; > + args->v0.token = object->token; > + args->v0.route = object->route; > + return 0; > } > > int > @@ -301,6 +329,7 @@ usif_ioctl(struct drm_file *filp, void __user *user, u32 > argc) > struct nvif_ioctl_v0 v0; > } *argv = data; > struct usif_object *object; > + bool abi16 = false; > u8 owner; > int ret; > > @@ -331,11 +360,13 @@ usif_ioctl(struct drm_file *filp, void __user *user, > u32 argc) > mutex_unlock(&cli->mutex); > goto done; > } > + > + abi16 = true; > } > > switch (argv->v0.type) { > case NVIF_IOCTL_V0_NEW: > - ret = usif_object_new(filp, data, size, argv, argc); > + ret = usif_object_new(filp, data, size, argv, argc, abi16); > break; > case NVIF_IOCTL_V0_NTFY_NEW: > ret = usif_notify_new(filp, data, size, argv, argc); > diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c > b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c > index 513ee6b79553..08100eed9584 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c > @@ -347,7 +347,7 @@ nvkm_udevice_new(const struct nvkm_oclass *oclass, void > *data, u32 size, > return ret; > > /* give priviledged clients register access */ > - if (client->super) > + if (args->v0.priv) > func = &nvkm_udevice_super; > else > func = &nvkm_udevice; -- Cheers, Lyude Paul (she/her) Software Engineer at Red Hat ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Nouveau] [PATCH AUTOSEL 4.14 6/7] drm/nouveau: block a bunch of classes from userspace 2021-08-24 17:05 ` Lyude Paul @ 2021-08-30 12:17 ` Sasha Levin 0 siblings, 0 replies; 4+ messages in thread From: Sasha Levin @ 2021-08-30 12:17 UTC (permalink / raw) To: Lyude Paul; +Cc: linux-kernel, stable, Ben Skeggs, dri-devel, nouveau On Tue, Aug 24, 2021 at 01:05:32PM -0400, Lyude Paul wrote: >This isn't at all intended to be a fix to be backported, so I don't think this >should be included. I don't know about 5/7, but I'll let Benjamin comment on >that one I'll drop it, thanks! -- Thanks, Sasha ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-08-30 12:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20210824005528.631702-1-sashal@kernel.org>
2021-08-24 0:55 ` [Nouveau] [PATCH AUTOSEL 4.14 5/7] drm/nouveau/disp: power down unused DP links during init Sasha Levin
2021-08-24 0:55 ` [Nouveau] [PATCH AUTOSEL 4.14 6/7] drm/nouveau: block a bunch of classes from userspace Sasha Levin
2021-08-24 17:05 ` Lyude Paul
2021-08-30 12:17 ` Sasha Levin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).