- transition from "ioctl" interface Signed-off-by: Ben Skeggs <bske...@nvidia.com> --- .../gpu/drm/nouveau/include/nvif/driverif.h | 1 + drivers/gpu/drm/nouveau/include/nvif/if0012.h | 19 ---------- drivers/gpu/drm/nouveau/nvif/outp.c | 29 ++++++--------- .../gpu/drm/nouveau/nvkm/engine/disp/uoutp.c | 35 ++++++++++--------- 4 files changed, 31 insertions(+), 53 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/include/nvif/driverif.h b/drivers/gpu/drm/nouveau/include/nvif/driverif.h index 9ab54de43ba3..a2e0423f76c2 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/driverif.h +++ b/drivers/gpu/drm/nouveau/include/nvif/driverif.h @@ -278,6 +278,7 @@ struct nvif_outp_impl { int (*inherit)(struct nvif_outp_priv *, enum nvif_outp_proto, u8 *or, u8 *link, u8 *head, u8 *proto_evo); + int (*acquire)(struct nvif_outp_priv *, enum nvif_outp_type, bool hda, u8 *or, u8 *link); int (*load_detect)(struct nvif_outp_priv *, u32 loadval, u8 *load); diff --git a/drivers/gpu/drm/nouveau/include/nvif/if0012.h b/drivers/gpu/drm/nouveau/include/nvif/if0012.h index 09e2f61673a8..3cbdb5fc4757 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/if0012.h +++ b/drivers/gpu/drm/nouveau/include/nvif/if0012.h @@ -4,7 +4,6 @@ #include <drm/display/drm_dp.h> -#define NVIF_OUTP_V0_ACQUIRE 0x11 #define NVIF_OUTP_V0_RELEASE 0x12 #define NVIF_OUTP_V0_BL_GET 0x30 @@ -27,24 +26,6 @@ #define NVIF_OUTP_V0_DP_MST_ID_PUT 0x77 #define NVIF_OUTP_V0_DP_MST_VCPI 0x78 -union nvif_outp_acquire_args { - struct nvif_outp_acquire_v0 { - __u8 version; -#define NVIF_OUTP_ACQUIRE_V0_DAC 0x00 -#define NVIF_OUTP_ACQUIRE_V0_SOR 0x01 -#define NVIF_OUTP_ACQUIRE_V0_PIOR 0x02 - __u8 type; - __u8 or; - __u8 link; - __u8 pad04[4]; - union { - struct { - __u8 hda; - } sor; - }; - } v0; -}; - union nvif_outp_release_args { struct nvif_outp_release_vn { } vn; diff --git a/drivers/gpu/drm/nouveau/nvif/outp.c b/drivers/gpu/drm/nouveau/nvif/outp.c index c98af48b4b33..ddcd2b9d69f3 100644 --- a/drivers/gpu/drm/nouveau/nvif/outp.c +++ b/drivers/gpu/drm/nouveau/nvif/outp.c @@ -302,54 +302,47 @@ nvif_outp_release(struct nvif_outp *outp) } static inline int -nvif_outp_acquire(struct nvif_outp *outp, u8 type, struct nvif_outp_acquire_v0 *args) +nvif_outp_acquire(struct nvif_outp *outp, enum nvif_outp_type type, bool hda) { + u8 or, link; int ret; - args->version = 0; - args->type = type; - - ret = nvif_mthd(&outp->object, NVIF_OUTP_V0_ACQUIRE, args, sizeof(*args)); + ret = outp->impl->acquire(outp->priv, type, hda, &or, &link); if (ret) return ret; - outp->or.id = args->or; - outp->or.link = args->link; + outp->or.id = or; + outp->or.link = link; return 0; } int nvif_outp_acquire_pior(struct nvif_outp *outp) { - struct nvif_outp_acquire_v0 args; int ret; - ret = nvif_outp_acquire(outp, NVIF_OUTP_ACQUIRE_V0_PIOR, &args); - NVIF_ERRON(ret, &outp->object, "[ACQUIRE PIOR] or:%d", args.or); + ret = nvif_outp_acquire(outp, NVIF_OUTP_PIOR, false); + NVIF_ERRON(ret, &outp->object, "[ACQUIRE PIOR] or:%d", outp->or.id); return ret; } int nvif_outp_acquire_sor(struct nvif_outp *outp, bool hda) { - struct nvif_outp_acquire_v0 args; int ret; - args.sor.hda = hda; - - ret = nvif_outp_acquire(outp, NVIF_OUTP_ACQUIRE_V0_SOR, &args); - NVIF_ERRON(ret, &outp->object, "[ACQUIRE SOR] or:%d link:%d", args.or, args.link); + ret = nvif_outp_acquire(outp, NVIF_OUTP_SOR, hda); + NVIF_ERRON(ret, &outp->object, "[ACQUIRE SOR] or:%d link:%d", outp->or.id, outp->or.link); return ret; } int nvif_outp_acquire_dac(struct nvif_outp *outp) { - struct nvif_outp_acquire_v0 args; int ret; - ret = nvif_outp_acquire(outp, NVIF_OUTP_ACQUIRE_V0_DAC, &args); - NVIF_ERRON(ret, &outp->object, "[ACQUIRE DAC] or:%d", args.or); + ret = nvif_outp_acquire(outp, NVIF_OUTP_DAC, false); + NVIF_ERRON(ret, &outp->object, "[ACQUIRE DAC] or:%d", outp->or.id); return ret; } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c index 3f242a03f77b..46ca915f0206 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c @@ -373,35 +373,38 @@ nvkm_uoutp_mthd_release(struct nvkm_outp *outp, void *argv, u32 argc) } static int -nvkm_uoutp_mthd_acquire(struct nvkm_outp *outp, void *argv, u32 argc) +nvkm_uoutp_acquire(struct nvif_outp_priv *uoutp, enum nvif_outp_type type, bool hda, + u8 *or, u8 *link) { - union nvif_outp_acquire_args *args = argv; + struct nvkm_outp *outp = uoutp->outp; int ret; - if (argc != sizeof(args->v0) || args->v0.version != 0) - return -ENOSYS; - if (outp->ior && args->v0.type <= NVIF_OUTP_ACQUIRE_V0_PIOR) + nvkm_uoutp_lock(uoutp); + if (outp->ior) { + nvkm_uoutp_unlock(uoutp); return -EBUSY; + } - switch (args->v0.type) { - case NVIF_OUTP_ACQUIRE_V0_DAC: - case NVIF_OUTP_ACQUIRE_V0_PIOR: + switch (type) { + case NVIF_OUTP_DAC: + case NVIF_OUTP_PIOR: ret = outp->func->acquire(outp, false); break; - case NVIF_OUTP_ACQUIRE_V0_SOR: - ret = outp->func->acquire(outp, args->v0.sor.hda); + case NVIF_OUTP_SOR: + ret = outp->func->acquire(outp, hda); break; default: ret = -EINVAL; break; } - if (ret) - return ret; + if (ret == 0) { + *or = outp->ior->id; + *link = outp->ior->asy.link; + } - args->v0.or = outp->ior->id; - args->v0.link = outp->ior->asy.link; - return 0; + nvkm_uoutp_unlock(uoutp); + return ret; } static int @@ -549,7 +552,6 @@ static int nvkm_uoutp_mthd_noacquire(struct nvkm_outp *outp, u32 mthd, void *argv, u32 argc, bool *invalid) { switch (mthd) { - case NVIF_OUTP_V0_ACQUIRE : return nvkm_uoutp_mthd_acquire (outp, argv, argc); case NVIF_OUTP_V0_BL_GET : return nvkm_uoutp_mthd_bl_get (outp, argv, argc); case NVIF_OUTP_V0_BL_SET : return nvkm_uoutp_mthd_bl_set (outp, argv, argc); case NVIF_OUTP_V0_DP_AUX_PWR : return nvkm_uoutp_mthd_dp_aux_pwr (outp, argv, argc); @@ -599,6 +601,7 @@ static const struct nvif_outp_impl nvkm_uoutp_impl = { .del = nvkm_uoutp_del, .inherit = nvkm_uoutp_inherit, + .acquire = nvkm_uoutp_acquire, }; static void * -- 2.41.0