* linux@xxxxxxxxxxx (linux@xxxxxxxxxxx) wrote:
> From: "Dr. David Alan Gilbert" <linux@xxxxxxxxxxx>
>
> dcb_outp_match() last use was removed in 2017 in
> commit 99a845a30f62 ("drm/nouveau/disp/nv50-gt21x: remove workaround for
> dp->tmds hotplug issues")
>
> dcb_xpio_parse was added in 2012 in
> commit 112a12aab8a5 ("drm/nouveau/bios: add support for parsing xpio table
> data")
> but never used.
>
> Remove them.
>
> dcb_xpio_parse was the last user of struct nvbios_xpio, so remove it
> as well and the FLAG #defines.
>
> Signed-off-by: Dr. David Alan Gilbert <linux@xxxxxxxxxxx>
Ping.
Thanks,
Dave
> ---
> .../gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h | 2 --
> .../drm/nouveau/include/nvkm/subdev/bios/xpio.h | 12 ------------
> drivers/gpu/drm/nouveau/nvkm/subdev/bios/dcb.c | 14 --------------
> drivers/gpu/drm/nouveau/nvkm/subdev/bios/xpio.c | 13 -------------
> 4 files changed, 41 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h
> index 73f9d9947e7e..12e6b2f21564 100644
> --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h
> +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h
> @@ -61,8 +61,6 @@ u16 dcb_table(struct nvkm_bios *, u8 *ver, u8 *hdr, u8 *ent, u8 *len);
> u16 dcb_outp(struct nvkm_bios *, u8 idx, u8 *ver, u8 *len);
> u16 dcb_outp_parse(struct nvkm_bios *, u8 idx, u8 *, u8 *,
> struct dcb_output *);
> -u16 dcb_outp_match(struct nvkm_bios *, u16 type, u16 mask, u8 *, u8 *,
> - struct dcb_output *);
> int dcb_outp_foreach(struct nvkm_bios *, void *data, int (*exec)
> (struct nvkm_bios *, void *, int index, u16 entry));
> #endif
> diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/xpio.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/xpio.h
> index 11b4c4d27e5f..cd0ffebcb73a 100644
> --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/xpio.h
> +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/xpio.h
> @@ -2,18 +2,6 @@
> #ifndef __NVBIOS_XPIO_H__
> #define __NVBIOS_XPIO_H__
>
> -#define NVBIOS_XPIO_FLAG_AUX 0x10
> -#define NVBIOS_XPIO_FLAG_AUX0 0x00
> -#define NVBIOS_XPIO_FLAG_AUX1 0x10
> -
> -struct nvbios_xpio {
> - u8 type;
> - u8 addr;
> - u8 flags;
> -};
> -
> u16 dcb_xpio_table(struct nvkm_bios *, u8 idx,
> u8 *ver, u8 *hdr, u8 *cnt, u8 *len);
> -u16 dcb_xpio_parse(struct nvkm_bios *, u8 idx,
> - u8 *ver, u8 *hdr, u8 *cnt, u8 *len, struct nvbios_xpio *);
> #endif
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/dcb.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/dcb.c
> index 8698f260b988..ae1faa63d68f 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/dcb.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/dcb.c
> @@ -193,20 +193,6 @@ dcb_outp_parse(struct nvkm_bios *bios, u8 idx, u8 *ver, u8 *len,
> return dcb;
> }
>
> -u16
> -dcb_outp_match(struct nvkm_bios *bios, u16 type, u16 mask,
> - u8 *ver, u8 *len, struct dcb_output *outp)
> -{
> - u16 dcb, idx = 0;
> - while ((dcb = dcb_outp_parse(bios, idx++, ver, len, outp))) {
> - if ((dcb_outp_hasht(outp) & 0x00ff) == (type & 0x00ff)) {
> - if ((dcb_outp_hashm(outp) & mask) == mask)
> - break;
> - }
> - }
> - return dcb;
> -}
> -
> int
> dcb_outp_foreach(struct nvkm_bios *bios, void *data,
> int (*exec)(struct nvkm_bios *, void *, int, u16))
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/xpio.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/xpio.c
> index 250fc42d8608..a47393e90de9 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/xpio.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/xpio.c
> @@ -59,16 +59,3 @@ dcb_xpio_table(struct nvkm_bios *bios, u8 idx,
> }
> return 0x0000;
> }
> -
> -u16
> -dcb_xpio_parse(struct nvkm_bios *bios, u8 idx,
> - u8 *ver, u8 *hdr, u8 *cnt, u8 *len, struct nvbios_xpio *info)
> -{
> - u16 data = dcb_xpio_table(bios, idx, ver, hdr, cnt, len);
> - if (data && *len >= 6) {
> - info->type = nvbios_rd08(bios, data + 0x04);
> - info->addr = nvbios_rd08(bios, data + 0x05);
> - info->flags = nvbios_rd08(bios, data + 0x06);
> - }
> - return 0x0000;
> -}
> --
> 2.47.0
>
--
-----Open up your eyes, open up your mind, open up your code -------
/ Dr. David Alan Gilbert | Running GNU/Linux | Happy \
\ dave @ treblig.org | | In Hex /
\ _________________________|_____ http://www.treblig.org |_______/
