- transition from "ioctl" interface
Signed-off-by: Ben Skeggs <bskeggs@xxxxxxxxxx>
---
.../gpu/drm/nouveau/include/nvif/driverif.h | 2 ++
drivers/gpu/drm/nouveau/include/nvif/if0012.h | 12 -------
drivers/gpu/drm/nouveau/nvif/outp.c | 10 ++----
.../gpu/drm/nouveau/nvkm/engine/disp/uoutp.c | 34 ++++++++++++-------
4 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/include/nvif/driverif.h b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
index db6fb1347b72..dc103d2a20a9 100644
--- a/drivers/gpu/drm/nouveau/include/nvif/driverif.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
@@ -339,6 +339,8 @@ struct nvif_outp_impl {
int (*train)(struct nvif_outp_priv *, u8 dpcd[DP_RECEIVER_CAP_SIZE], u8 lttprs,
u8 link_nr, u32 link_bw, bool mst, bool post_lt_adj, bool retrain);
int (*drive)(struct nvif_outp_priv *, u8 lanes, u8 pe[4], u8 vs[4]);
+ int (*sst)(struct nvif_outp_priv *, u8 head,
+ u32 watermark, u32 hblanksym, u32 vblanksym);
} dp;
};
diff --git a/drivers/gpu/drm/nouveau/include/nvif/if0012.h b/drivers/gpu/drm/nouveau/include/nvif/if0012.h
index 8b0f90327187..92c4988101eb 100644
--- a/drivers/gpu/drm/nouveau/include/nvif/if0012.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/if0012.h
@@ -2,22 +2,10 @@
#ifndef __NVIF_IF0012_H__
#define __NVIF_IF0012_H__
-#define NVIF_OUTP_V0_DP_SST 0x75
#define NVIF_OUTP_V0_DP_MST_ID_GET 0x76
#define NVIF_OUTP_V0_DP_MST_ID_PUT 0x77
#define NVIF_OUTP_V0_DP_MST_VCPI 0x78
-union nvif_outp_dp_sst_args {
- struct nvif_outp_dp_sst_v0 {
- __u8 version;
- __u8 head;
- __u8 pad02[2];
- __u32 watermark;
- __u32 hblanksym;
- __u32 vblanksym;
- } v0;
-};
-
union nvif_outp_dp_mst_id_put_args {
struct nvif_outp_dp_mst_id_put_v0 {
__u8 version;
diff --git a/drivers/gpu/drm/nouveau/nvif/outp.c b/drivers/gpu/drm/nouveau/nvif/outp.c
index 3d4461e3a2cd..f56485c2ad2c 100644
--- a/drivers/gpu/drm/nouveau/nvif/outp.c
+++ b/drivers/gpu/drm/nouveau/nvif/outp.c
@@ -78,18 +78,12 @@ nvif_outp_dp_mst_id_get(struct nvif_outp *outp, u32 *id)
int
nvif_outp_dp_sst(struct nvif_outp *outp, int head, u32 watermark, u32 hblanksym, u32 vblanksym)
{
- struct nvif_outp_dp_sst_v0 args;
int ret;
- args.version = 0;
- args.head = head;
- args.watermark = watermark;
- args.hblanksym = hblanksym;
- args.vblanksym = vblanksym;
- ret = nvif_object_mthd(&outp->object, NVIF_OUTP_V0_DP_SST, &args, sizeof(args));
+ ret = outp->impl->dp.sst(outp->priv, head, watermark, hblanksym, vblanksym);
NVIF_ERRON(ret, &outp->object,
"[DP_SST head:%d watermark:%d hblanksym:%d vblanksym:%d]",
- args.head, args.watermark, args.hblanksym, args.vblanksym);
+ head, watermark, hblanksym, vblanksym);
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 3d5b6cee97bc..cfa386c1bbeb 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c
@@ -103,23 +103,31 @@ nvkm_uoutp_mthd_dp_mst_id_get(struct nvkm_outp *outp, void *argv, u32 argc)
}
static int
-nvkm_uoutp_mthd_dp_sst(struct nvkm_outp *outp, void *argv, u32 argc)
+nvkm_uoutp_dp_sst(struct nvif_outp_priv *uoutp, u8 head,
+ u32 watermark, u32 hblanksym, u32 vblanksym)
{
- union nvif_outp_dp_sst_args *args = argv;
+ struct nvkm_outp *outp = uoutp->outp;
struct nvkm_disp *disp = outp->disp;
- struct nvkm_ior *ior = outp->ior;
-
- if (argc != sizeof(args->v0) || args->v0.version != 0)
- return -ENOSYS;
+ struct nvkm_ior *ior;
+ int ret;
- if (!ior->func->dp || !nvkm_head_find(disp, args->v0.head))
+ if (!nvkm_head_find(disp, head))
return -EINVAL;
- if (!ior->func->dp->sst)
- return 0;
- return ior->func->dp->sst(ior, args->v0.head,
- outp->dp.dpcd[DPCD_RC02] & DPCD_RC02_ENHANCED_FRAME_CAP,
- args->v0.watermark, args->v0.hblanksym, args->v0.vblanksym);
+ ret = nvkm_uoutp_lock_acquired(uoutp);
+ if (ret)
+ return ret;
+
+ ior = outp->ior;
+
+ if (ior->func->dp->sst) {
+ ret = ior->func->dp->sst(ior, head,
+ outp->dp.dpcd[DPCD_RC02] & DPCD_RC02_ENHANCED_FRAME_CAP,
+ watermark, hblanksym, vblanksym);
+ }
+
+ nvkm_uoutp_unlock(uoutp);
+ return ret;
}
static int
@@ -550,7 +558,6 @@ static int
nvkm_uoutp_mthd_acquired(struct nvkm_outp *outp, u32 mthd, void *argv, u32 argc)
{
switch (mthd) {
- case NVIF_OUTP_V0_DP_SST : return nvkm_uoutp_mthd_dp_sst (outp, argv, argc);
case NVIF_OUTP_V0_DP_MST_ID_GET: return nvkm_uoutp_mthd_dp_mst_id_get(outp, argv, argc);
case NVIF_OUTP_V0_DP_MST_ID_PUT: return nvkm_uoutp_mthd_dp_mst_id_put(outp, argv, argc);
case NVIF_OUTP_V0_DP_MST_VCPI : return nvkm_uoutp_mthd_dp_mst_vcpi (outp, argv, argc);
@@ -690,6 +697,7 @@ nvkm_uoutp_new(struct nvkm_disp *disp, u8 id, const struct nvif_outp_impl **pimp
uoutp->impl.dp.rates = nvkm_uoutp_dp_rates;
uoutp->impl.dp.train = nvkm_uoutp_dp_train;
uoutp->impl.dp.drive = nvkm_uoutp_dp_drive;
+ uoutp->impl.dp.sst = nvkm_uoutp_dp_sst;
break;
default:
WARN_ON(1);
--
2.41.0
