- transition from "ioctl" interface
Signed-off-by: Ben Skeggs <bskeggs@xxxxxxxxxx>
---
.../gpu/drm/nouveau/include/nvif/driverif.h | 6 +++
drivers/gpu/drm/nouveau/include/nvif/if0012.h | 13 -------
drivers/gpu/drm/nouveau/include/nvif/outp.h | 5 ---
drivers/gpu/drm/nouveau/nvif/outp.c | 17 ++------
.../gpu/drm/nouveau/nvkm/engine/disp/uoutp.c | 39 ++++++-------------
5 files changed, 20 insertions(+), 60 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/include/nvif/driverif.h b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
index 2069eedde843..9395ddad65bf 100644
--- a/drivers/gpu/drm/nouveau/include/nvif/driverif.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
@@ -255,6 +255,11 @@ enum nvif_outp_detect_status {
NVIF_OUTP_DETECT_UNKNOWN,
};
+struct nvif_outp_dp_rate {
+ int dpcd; /* -1 for non-indexed rates */
+ u32 rate;
+};
+
struct nvif_outp_impl {
void (*del)(struct nvif_outp_priv *);
@@ -328,6 +333,7 @@ struct nvif_outp_impl {
int (*aux_pwr)(struct nvif_outp_priv *, bool enable);
int (*aux_xfer)(struct nvif_outp_priv *, u8 type, u32 addr, u8 *data, u8 *size);
+ int (*rates)(struct nvif_outp_priv *, struct nvif_outp_dp_rate *, u8 rates);
} dp;
};
diff --git a/drivers/gpu/drm/nouveau/include/nvif/if0012.h b/drivers/gpu/drm/nouveau/include/nvif/if0012.h
index b036197aadea..327ff9aa3ae0 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_DP_RATES 0x72
#define NVIF_OUTP_V0_DP_TRAIN 0x73
#define NVIF_OUTP_V0_DP_DRIVE 0x74
#define NVIF_OUTP_V0_DP_SST 0x75
@@ -12,18 +11,6 @@
#define NVIF_OUTP_V0_DP_MST_ID_PUT 0x77
#define NVIF_OUTP_V0_DP_MST_VCPI 0x78
-union nvif_outp_dp_rates_args {
- struct nvif_outp_dp_rates_v0 {
- __u8 version;
- __u8 pad01[6];
- __u8 rates;
- struct {
- __s8 dpcd;
- __u32 rate;
- } rate[8];
- } v0;
-};
-
union nvif_outp_dp_train_args {
struct nvif_outp_dp_train_v0 {
__u8 version;
diff --git a/drivers/gpu/drm/nouveau/include/nvif/outp.h b/drivers/gpu/drm/nouveau/include/nvif/outp.h
index 8be799c88aff..7f7620ec1487 100644
--- a/drivers/gpu/drm/nouveau/include/nvif/outp.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/outp.h
@@ -56,11 +56,6 @@ int nvif_outp_hda_eld(struct nvif_outp *, int head, void *data, u32 size);
int nvif_outp_dp_aux_pwr(struct nvif_outp *, bool enable);
int nvif_outp_dp_aux_xfer(struct nvif_outp *, u8 type, u8 *size, u32 addr, u8 *data);
-struct nvif_outp_dp_rate {
- int dpcd; /* -1 for non-indexed rates */
- u32 rate;
-};
-
int nvif_outp_dp_rates(struct nvif_outp *, struct nvif_outp_dp_rate *rate, int rate_nr);
int nvif_outp_dp_train(struct nvif_outp *, u8 dpcd[DP_RECEIVER_CAP_SIZE],
u8 lttprs, u8 link_nr, u32 link_bw, bool mst, bool post_lt_adj,
diff --git a/drivers/gpu/drm/nouveau/nvif/outp.c b/drivers/gpu/drm/nouveau/nvif/outp.c
index 602362aa0203..68af891505d1 100644
--- a/drivers/gpu/drm/nouveau/nvif/outp.c
+++ b/drivers/gpu/drm/nouveau/nvif/outp.c
@@ -134,23 +134,12 @@ nvif_outp_dp_train(struct nvif_outp *outp, u8 dpcd[DP_RECEIVER_CAP_SIZE], u8 ltt
}
int
-nvif_outp_dp_rates(struct nvif_outp *outp, struct nvif_outp_dp_rate *rate, int rate_nr)
+nvif_outp_dp_rates(struct nvif_outp *outp, struct nvif_outp_dp_rate *rate, int rates)
{
- struct nvif_outp_dp_rates_v0 args;
int ret;
- if (rate_nr > ARRAY_SIZE(args.rate))
- return -EINVAL;
-
- args.version = 0;
- args.rates = rate_nr;
- for (int i = 0; i < args.rates; i++, rate++) {
- args.rate[i].dpcd = rate->dpcd;
- args.rate[i].rate = rate->rate;
- }
-
- ret = nvif_object_mthd(&outp->object, NVIF_OUTP_V0_DP_RATES, &args, sizeof(args));
- NVIF_ERRON(ret, &outp->object, "[DP_RATES rates:%d]", args.rates);
+ ret = outp->impl->dp.rates(outp->priv, rate, rates);
+ NVIF_ERRON(ret, &outp->object, "[DP_RATES rates:%d]", rates);
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 f7226bcb9ef4..00b66d400f68 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c
@@ -158,25 +158,26 @@ nvkm_uoutp_mthd_dp_train(struct nvkm_outp *outp, void *argv, u32 argc)
}
static int
-nvkm_uoutp_mthd_dp_rates(struct nvkm_outp *outp, void *argv, u32 argc)
+nvkm_uoutp_dp_rates(struct nvif_outp_priv *uoutp, struct nvif_outp_dp_rate *rate, u8 rates)
{
- union nvif_outp_dp_rates_args *args = argv;
+ struct nvkm_outp *outp = uoutp->outp;
- if (argc != sizeof(args->v0) || args->v0.version != 0)
- return -ENOSYS;
- if (args->v0.rates > ARRAY_SIZE(outp->dp.rate))
+ if (rates > ARRAY_SIZE(outp->dp.rate))
return -EINVAL;
- for (int i = 0; i < args->v0.rates; i++) {
- outp->dp.rate[i].dpcd = args->v0.rate[i].dpcd;
- outp->dp.rate[i].rate = args->v0.rate[i].rate;
+ nvkm_uoutp_lock(uoutp);
+
+ for (int i = 0; i < rates; i++) {
+ outp->dp.rate[i].dpcd = rate[i].dpcd;
+ outp->dp.rate[i].rate = rate[i].rate;
}
- outp->dp.rates = args->v0.rates;
+ outp->dp.rates = rates;
if (outp->func->dp.rates)
outp->func->dp.rates(outp);
+ nvkm_uoutp_unlock(uoutp);
return 0;
}
@@ -557,39 +558,20 @@ nvkm_uoutp_mthd_acquired(struct nvkm_outp *outp, u32 mthd, void *argv, u32 argc)
return -EINVAL;
}
-static int
-nvkm_uoutp_mthd_noacquire(struct nvkm_outp *outp, u32 mthd, void *argv, u32 argc, bool *invalid)
-{
- switch (mthd) {
- case NVIF_OUTP_V0_DP_RATES : return nvkm_uoutp_mthd_dp_rates (outp, argv, argc);
- default:
- break;
- }
-
- *invalid = true;
- return 0;
-}
-
static int
nvkm_uoutp_mthd(struct nvkm_object *object, u32 mthd, void *argv, u32 argc)
{
struct nvkm_outp *outp = container_of(object, struct nvif_outp_priv, object)->outp;
struct nvkm_disp *disp = outp->disp;
- bool invalid = false;
int ret;
mutex_lock(&disp->super.mutex);
- ret = nvkm_uoutp_mthd_noacquire(outp, mthd, argv, argc, &invalid);
- if (!invalid)
- goto done;
-
if (outp->ior)
ret = nvkm_uoutp_mthd_acquired(outp, mthd, argv, argc);
else
ret = -EIO;
-done:
mutex_unlock(&disp->super.mutex);
return ret;
}
@@ -702,6 +684,7 @@ nvkm_uoutp_new(struct nvkm_disp *disp, u8 id, const struct nvif_outp_impl **pimp
uoutp->impl.dp.link_bw = outp->info.dpconf.link_bw * 27000;
uoutp->impl.dp.aux_pwr = nvkm_uoutp_dp_aux_pwr;
uoutp->impl.dp.aux_xfer = nvkm_uoutp_dp_aux_xfer;
+ uoutp->impl.dp.rates = nvkm_uoutp_dp_rates;
break;
default:
WARN_ON(1);
--
2.41.0
