- 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 | 10 ---------- drivers/gpu/drm/nouveau/nvif/outp.c | 9 ++------- .../gpu/drm/nouveau/nvkm/engine/disp/uoutp.c | 19 ++++++++++--------- 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/nouveau/include/nvif/driverif.h b/drivers/gpu/drm/nouveau/include/nvif/driverif.h index 7c4e3df12a8e..1eec40976a70 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/driverif.h +++ b/drivers/gpu/drm/nouveau/include/nvif/driverif.h @@ -293,6 +293,8 @@ struct nvif_outp_impl { struct { u8 acpi_edid; + + int (*config)(struct nvif_outp_priv *, bool dual, bool bpc8); } lvds; struct { diff --git a/drivers/gpu/drm/nouveau/include/nvif/if0012.h b/drivers/gpu/drm/nouveau/include/nvif/if0012.h index 0bdd8ddc65d3..d8c6e84cf5ae 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/if0012.h +++ b/drivers/gpu/drm/nouveau/include/nvif/if0012.h @@ -4,8 +4,6 @@ #include <drm/display/drm_dp.h> -#define NVIF_OUTP_V0_LVDS 0x40 - #define NVIF_OUTP_V0_HDMI 0x50 #define NVIF_OUTP_V0_INFOFRAME 0x60 @@ -21,14 +19,6 @@ #define NVIF_OUTP_V0_DP_MST_ID_PUT 0x77 #define NVIF_OUTP_V0_DP_MST_VCPI 0x78 -union nvif_outp_lvds_args { - struct nvif_outp_lvds_v0 { - __u8 version; - __u8 dual; - __u8 bpc8; - } v0; -}; - union nvif_outp_hdmi_args { struct nvif_outp_hdmi_v0 { __u8 version; diff --git a/drivers/gpu/drm/nouveau/nvif/outp.c b/drivers/gpu/drm/nouveau/nvif/outp.c index 7929dc896b6b..edcb5598efac 100644 --- a/drivers/gpu/drm/nouveau/nvif/outp.c +++ b/drivers/gpu/drm/nouveau/nvif/outp.c @@ -254,15 +254,10 @@ nvif_outp_hdmi(struct nvif_outp *outp, int head, bool enable, u8 max_ac_packet, int nvif_outp_lvds(struct nvif_outp *outp, bool dual, bool bpc8) { - struct nvif_outp_lvds_v0 args; int ret; - args.version = 0; - args.dual = dual; - args.bpc8 = bpc8; - - ret = nvif_mthd(&outp->object, NVIF_OUTP_V0_LVDS, &args, sizeof(args)); - NVIF_ERRON(ret, &outp->object, "[LVDS dual:%d 8bpc:%d]", args.dual, args.bpc8); + ret = outp->impl->lvds.config(outp->priv, dual, bpc8); + NVIF_ERRON(ret, &outp->object, "[LVDS dual:%d 8bpc:%d]", dual, bpc8); 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 5483ca37ca0e..93de3990554e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c @@ -305,17 +305,18 @@ nvkm_uoutp_mthd_hdmi(struct nvkm_outp *outp, void *argv, u32 argc) } static int -nvkm_uoutp_mthd_lvds(struct nvkm_outp *outp, void *argv, u32 argc) +nvkm_uoutp_lvds(struct nvif_outp_priv *uoutp, bool dual, bool bpc8) { - union nvif_outp_lvds_args *args = argv; + struct nvkm_outp *outp = uoutp->outp; + int ret; - if (argc != sizeof(args->v0) || args->v0.version != 0) - return -ENOSYS; - if (outp->info.type != DCB_OUTPUT_LVDS) - return -EINVAL; + ret = nvkm_uoutp_lock_acquired(uoutp); + if (ret) + return ret; - outp->lvds.dual = !!args->v0.dual; - outp->lvds.bpc8 = !!args->v0.bpc8; + outp->lvds.dual = dual; + outp->lvds.bpc8 = bpc8; + nvkm_uoutp_unlock(uoutp); return 0; } @@ -521,7 +522,6 @@ static int nvkm_uoutp_mthd_acquired(struct nvkm_outp *outp, u32 mthd, void *argv, u32 argc) { switch (mthd) { - case NVIF_OUTP_V0_LVDS : return nvkm_uoutp_mthd_lvds (outp, argv, argc); case NVIF_OUTP_V0_HDMI : return nvkm_uoutp_mthd_hdmi (outp, argv, argc); case NVIF_OUTP_V0_INFOFRAME : return nvkm_uoutp_mthd_infoframe (outp, argv, argc); case NVIF_OUTP_V0_HDA_ELD : return nvkm_uoutp_mthd_hda_eld (outp, argv, argc); @@ -664,6 +664,7 @@ nvkm_uoutp_new(struct nvkm_disp *disp, u8 id, const struct nvif_outp_impl **pimp uoutp->impl.type = NVIF_OUTP_SOR; uoutp->impl.proto = NVIF_OUTP_LVDS; uoutp->impl.lvds.acpi_edid = outp->info.lvdsconf.use_acpi_for_edid; + uoutp->impl.lvds.config = nvkm_uoutp_lvds; break; case DCB_OUTPUT_DP: if (!outp->info.location) { -- 2.41.0