From: Danilo Krummrich <dakr@redhat.com>
To: Ben Skeggs <bskeggs@nvidia.com>
Cc: nouveau@lists.freedesktop.org
Subject: Re: [PATCH v2 25/37] drm/nouveau/nvif: remove device rd/wr
Date: Tue, 9 Jul 2024 18:22:46 +0200 [thread overview]
Message-ID: <Zo1j1pgulLoXrCWq@pollux> (raw)
In-Reply-To: <20240704183721.25778-26-bskeggs@nvidia.com>
On Fri, Jul 05, 2024 at 04:37:09AM +1000, Ben Skeggs wrote:
> The device is always mapped now, so these are unneeded.
Instead of saying "now", please mention the change that makes this possible.
>
> Signed-off-by: Ben Skeggs <bskeggs@nvidia.com>
> ---
> .../drm/nouveau/include/nvkm/core/object.h | 8 ---
> drivers/gpu/drm/nouveau/nvkm/core/ioctl.c | 10 ----
> drivers/gpu/drm/nouveau/nvkm/core/object.c | 32 -----------
> drivers/gpu/drm/nouveau/nvkm/core/oproxy.c | 28 ----------
> .../gpu/drm/nouveau/nvkm/engine/device/user.c | 54 -------------------
> 5 files changed, 132 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/object.h b/drivers/gpu/drm/nouveau/include/nvkm/core/object.h
> index d4f1c964ba31..c91abac44bd6 100644
> --- a/drivers/gpu/drm/nouveau/include/nvkm/core/object.h
> +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/object.h
> @@ -33,11 +33,7 @@ struct nvkm_object_func {
> int (*map)(struct nvkm_object *, void *argv, u32 argc,
> enum nvkm_object_map *, u64 *addr, u64 *size);
> int (*unmap)(struct nvkm_object *);
> - int (*rd08)(struct nvkm_object *, u64 addr, u8 *data);
> - int (*rd16)(struct nvkm_object *, u64 addr, u16 *data);
> int (*rd32)(struct nvkm_object *, u64 addr, u32 *data);
> - int (*wr08)(struct nvkm_object *, u64 addr, u8 data);
> - int (*wr16)(struct nvkm_object *, u64 addr, u16 data);
> int (*wr32)(struct nvkm_object *, u64 addr, u32 data);
> int (*bind)(struct nvkm_object *, struct nvkm_gpuobj *, int align,
> struct nvkm_gpuobj **);
> @@ -61,11 +57,7 @@ int nvkm_object_ntfy(struct nvkm_object *, u32 mthd, struct nvkm_event **);
> int nvkm_object_map(struct nvkm_object *, void *argv, u32 argc,
> enum nvkm_object_map *, u64 *addr, u64 *size);
> int nvkm_object_unmap(struct nvkm_object *);
> -int nvkm_object_rd08(struct nvkm_object *, u64 addr, u8 *data);
> -int nvkm_object_rd16(struct nvkm_object *, u64 addr, u16 *data);
> int nvkm_object_rd32(struct nvkm_object *, u64 addr, u32 *data);
> -int nvkm_object_wr08(struct nvkm_object *, u64 addr, u8 data);
> -int nvkm_object_wr16(struct nvkm_object *, u64 addr, u16 data);
> int nvkm_object_wr32(struct nvkm_object *, u64 addr, u32 data);
> int nvkm_object_bind(struct nvkm_object *, struct nvkm_gpuobj *, int align,
> struct nvkm_gpuobj **);
> diff --git a/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c b/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c
> index 584fc43c0d75..95e9537e1d7c 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c
> @@ -206,14 +206,6 @@ nvkm_ioctl_rd(struct nvkm_client *client,
> nvif_ioctl(object, "rd vers %d size %d addr %016llx\n",
> args->v0.version, args->v0.size, args->v0.addr);
> switch (args->v0.size) {
> - case 1:
> - ret = nvkm_object_rd08(object, args->v0.addr, &v.b08);
> - args->v0.data = v.b08;
> - break;
> - case 2:
> - ret = nvkm_object_rd16(object, args->v0.addr, &v.b16);
> - args->v0.data = v.b16;
> - break;
> case 4:
> ret = nvkm_object_rd32(object, args->v0.addr, &v.b32);
> args->v0.data = v.b32;
> @@ -246,8 +238,6 @@ nvkm_ioctl_wr(struct nvkm_client *client,
> return ret;
>
> switch (args->v0.size) {
> - case 1: return nvkm_object_wr08(object, args->v0.addr, args->v0.data);
> - case 2: return nvkm_object_wr16(object, args->v0.addr, args->v0.data);
> case 4: return nvkm_object_wr32(object, args->v0.addr, args->v0.data);
> default:
> break;
> diff --git a/drivers/gpu/drm/nouveau/nvkm/core/object.c b/drivers/gpu/drm/nouveau/nvkm/core/object.c
> index 580b8c7f25af..913c3bae51f7 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/core/object.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/core/object.c
> @@ -132,22 +132,6 @@ nvkm_object_unmap(struct nvkm_object *object)
> return -ENODEV;
> }
>
> -int
> -nvkm_object_rd08(struct nvkm_object *object, u64 addr, u8 *data)
> -{
> - if (likely(object->func->rd08))
> - return object->func->rd08(object, addr, data);
> - return -ENODEV;
> -}
> -
> -int
> -nvkm_object_rd16(struct nvkm_object *object, u64 addr, u16 *data)
> -{
> - if (likely(object->func->rd16))
> - return object->func->rd16(object, addr, data);
> - return -ENODEV;
> -}
> -
> int
> nvkm_object_rd32(struct nvkm_object *object, u64 addr, u32 *data)
> {
> @@ -156,22 +140,6 @@ nvkm_object_rd32(struct nvkm_object *object, u64 addr, u32 *data)
> return -ENODEV;
> }
>
> -int
> -nvkm_object_wr08(struct nvkm_object *object, u64 addr, u8 data)
> -{
> - if (likely(object->func->wr08))
> - return object->func->wr08(object, addr, data);
> - return -ENODEV;
> -}
> -
> -int
> -nvkm_object_wr16(struct nvkm_object *object, u64 addr, u16 data)
> -{
> - if (likely(object->func->wr16))
> - return object->func->wr16(object, addr, data);
> - return -ENODEV;
> -}
> -
> int
> nvkm_object_wr32(struct nvkm_object *object, u64 addr, u32 data)
> {
> diff --git a/drivers/gpu/drm/nouveau/nvkm/core/oproxy.c b/drivers/gpu/drm/nouveau/nvkm/core/oproxy.c
> index 3385528da650..afc10ec256a7 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/core/oproxy.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/core/oproxy.c
> @@ -55,36 +55,12 @@ nvkm_oproxy_unmap(struct nvkm_object *object)
> return nvkm_object_unmap(oproxy->object);
> }
>
> -static int
> -nvkm_oproxy_rd08(struct nvkm_object *object, u64 addr, u8 *data)
> -{
> - return nvkm_object_rd08(nvkm_oproxy(object)->object, addr, data);
> -}
> -
> -static int
> -nvkm_oproxy_rd16(struct nvkm_object *object, u64 addr, u16 *data)
> -{
> - return nvkm_object_rd16(nvkm_oproxy(object)->object, addr, data);
> -}
> -
> static int
> nvkm_oproxy_rd32(struct nvkm_object *object, u64 addr, u32 *data)
> {
> return nvkm_object_rd32(nvkm_oproxy(object)->object, addr, data);
> }
>
> -static int
> -nvkm_oproxy_wr08(struct nvkm_object *object, u64 addr, u8 data)
> -{
> - return nvkm_object_wr08(nvkm_oproxy(object)->object, addr, data);
> -}
> -
> -static int
> -nvkm_oproxy_wr16(struct nvkm_object *object, u64 addr, u16 data)
> -{
> - return nvkm_object_wr16(nvkm_oproxy(object)->object, addr, data);
> -}
> -
> static int
> nvkm_oproxy_wr32(struct nvkm_object *object, u64 addr, u32 data)
> {
> @@ -197,11 +173,7 @@ nvkm_oproxy_func = {
> .ntfy = nvkm_oproxy_ntfy,
> .map = nvkm_oproxy_map,
> .unmap = nvkm_oproxy_unmap,
> - .rd08 = nvkm_oproxy_rd08,
> - .rd16 = nvkm_oproxy_rd16,
> .rd32 = nvkm_oproxy_rd32,
> - .wr08 = nvkm_oproxy_wr08,
> - .wr16 = nvkm_oproxy_wr16,
> .wr32 = nvkm_oproxy_wr32,
> .bind = nvkm_oproxy_bind,
> .sclass = nvkm_oproxy_sclass,
> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
> index 65bd6712bce2..d7f75b3a43c8 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
> @@ -202,54 +202,6 @@ nvkm_udevice_mthd(struct nvkm_object *object, u32 mthd, void *data, u32 size)
> return -EINVAL;
> }
>
> -static int
> -nvkm_udevice_rd08(struct nvkm_object *object, u64 addr, u8 *data)
> -{
> - struct nvkm_udevice *udev = nvkm_udevice(object);
> - *data = nvkm_rd08(udev->device, addr);
> - return 0;
> -}
> -
> -static int
> -nvkm_udevice_rd16(struct nvkm_object *object, u64 addr, u16 *data)
> -{
> - struct nvkm_udevice *udev = nvkm_udevice(object);
> - *data = nvkm_rd16(udev->device, addr);
> - return 0;
> -}
> -
> -static int
> -nvkm_udevice_rd32(struct nvkm_object *object, u64 addr, u32 *data)
> -{
> - struct nvkm_udevice *udev = nvkm_udevice(object);
> - *data = nvkm_rd32(udev->device, addr);
> - return 0;
> -}
> -
> -static int
> -nvkm_udevice_wr08(struct nvkm_object *object, u64 addr, u8 data)
> -{
> - struct nvkm_udevice *udev = nvkm_udevice(object);
> - nvkm_wr08(udev->device, addr, data);
> - return 0;
> -}
> -
> -static int
> -nvkm_udevice_wr16(struct nvkm_object *object, u64 addr, u16 data)
> -{
> - struct nvkm_udevice *udev = nvkm_udevice(object);
> - nvkm_wr16(udev->device, addr, data);
> - return 0;
> -}
> -
> -static int
> -nvkm_udevice_wr32(struct nvkm_object *object, u64 addr, u32 data)
> -{
> - struct nvkm_udevice *udev = nvkm_udevice(object);
> - nvkm_wr32(udev->device, addr, data);
> - return 0;
> -}
> -
> static int
> nvkm_udevice_map(struct nvkm_object *object, void *argv, u32 argc,
> enum nvkm_object_map *type, u64 *addr, u64 *size)
> @@ -362,12 +314,6 @@ nvkm_udevice = {
> .fini = nvkm_udevice_fini,
> .mthd = nvkm_udevice_mthd,
> .map = nvkm_udevice_map,
> - .rd08 = nvkm_udevice_rd08,
> - .rd16 = nvkm_udevice_rd16,
> - .rd32 = nvkm_udevice_rd32,
> - .wr08 = nvkm_udevice_wr08,
> - .wr16 = nvkm_udevice_wr16,
> - .wr32 = nvkm_udevice_wr32,
> .sclass = nvkm_udevice_child_get,
> };
>
> --
> 2.45.1
>
next prev parent reply other threads:[~2024-07-09 16:22 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-04 18:36 [PATCH v2 00/37] drm/nouveau: misc. cleanups and removal of unused apis Ben Skeggs
2024-07-04 18:36 ` [PATCH v2 01/37] drm/nouveau: move nouveau_drm_device_fini() above init() Ben Skeggs
2024-07-09 14:48 ` Danilo Krummrich
2024-07-04 18:36 ` [PATCH v2 02/37] drm/nouveau: handle pci/tegra drm_dev_{alloc, register} from common code Ben Skeggs
2024-07-09 15:16 ` Danilo Krummrich
2024-07-18 7:14 ` Ben Skeggs
2024-07-19 11:10 ` Danilo Krummrich
2024-07-26 4:27 ` Ben Skeggs
2024-07-26 15:41 ` Danilo Krummrich
2024-07-26 13:07 ` Ben Skeggs
2024-07-27 1:54 ` Danilo Krummrich
2024-07-28 18:13 ` Jason Gunthorpe
2024-07-28 21:34 ` Danilo Krummrich
2024-07-28 23:04 ` Jason Gunthorpe
2024-07-29 0:55 ` Danilo Krummrich
2024-07-04 18:36 ` [PATCH v2 03/37] drm/nouveau: replace drm_device* with nouveau_drm* as dev drvdata Ben Skeggs
2024-07-04 18:36 ` [PATCH v2 04/37] drm/nouveau: create pci device once Ben Skeggs
2024-07-04 18:36 ` [PATCH v2 05/37] drm/nouveau: store nvkm_device pointer in nouveau_drm Ben Skeggs
2024-07-04 18:36 ` [PATCH v2 06/37] drm/nouveau: move allocation of root client out of nouveau_cli_init() Ben Skeggs
2024-07-09 15:33 ` Danilo Krummrich
2024-07-18 7:29 ` Ben Skeggs
2024-07-19 11:37 ` Danilo Krummrich
2024-07-26 4:29 ` Ben Skeggs
2024-07-04 18:36 ` [PATCH v2 07/37] drm/nouveau: add nouveau_cli to nouveau_abi16 Ben Skeggs
2024-07-09 15:36 ` Danilo Krummrich
2024-07-04 18:36 ` [PATCH v2 08/37] drm/nouveau: handle limited nvif ioctl in abi16 Ben Skeggs
2024-07-09 16:03 ` Danilo Krummrich
2024-07-18 7:43 ` Ben Skeggs
2024-07-19 12:06 ` Danilo Krummrich
2024-07-04 18:36 ` [PATCH v2 09/37] drm/nouveau: remove abi16->device Ben Skeggs
2024-07-04 18:36 ` [PATCH v2 10/37] drm/nouveau: remove abi16->handles Ben Skeggs
2024-07-04 18:36 ` [PATCH v2 11/37] drm/nouveau/nvkm: remove detect/mmio/subdev_mask from device args Ben Skeggs
2024-07-04 18:36 ` [PATCH v2 12/37] drm/nouveau/nvkm: remove perfmon Ben Skeggs
2024-07-04 18:36 ` [PATCH v2 13/37] drm/nouveau/nvkm: remove nvkm_client_search() Ben Skeggs
2024-07-04 18:36 ` [PATCH v2 14/37] drm/nouveau/nvif: remove support for userspace backends Ben Skeggs
2024-07-04 18:36 ` [PATCH v2 15/37] drm/nouveau/nvif: remove route/token Ben Skeggs
2024-07-09 16:11 ` Danilo Krummrich
2024-07-18 7:52 ` Ben Skeggs
2024-07-19 12:12 ` Danilo Krummrich
2024-07-04 18:37 ` [PATCH v2 16/37] drm/nouveau/nvif: remove nvxx_object() Ben Skeggs
2024-07-09 16:14 ` Danilo Krummrich
2024-07-04 18:37 ` [PATCH v2 17/37] drm/nouveau/nvif: remove nvxx_client() Ben Skeggs
2024-07-04 18:37 ` [PATCH v2 18/37] drm/nouveau/nvif: remove driver keep/fini Ben Skeggs
2024-07-04 18:37 ` [PATCH v2 19/37] drm/nouveau/nvif: remove client device arg Ben Skeggs
2024-07-09 16:16 ` Danilo Krummrich
2024-07-04 18:37 ` [PATCH v2 20/37] drm/nouveau/nvif: remove client version Ben Skeggs
2024-07-04 18:37 ` [PATCH v2 21/37] drm/nouveau/nvif: remove client devlist Ben Skeggs
2024-07-04 18:37 ` [PATCH v2 22/37] drm/nouveau/nvif: remove client fini Ben Skeggs
2024-07-04 18:37 ` [PATCH v2 23/37] drm/nouveau/nvif: remove device args Ben Skeggs
2024-07-09 16:18 ` Danilo Krummrich
2024-07-04 18:37 ` [PATCH v2 24/37] drm/nouveau: always map device Ben Skeggs
2024-07-04 18:37 ` [PATCH v2 25/37] drm/nouveau/nvif: remove device rd/wr Ben Skeggs
2024-07-09 16:22 ` Danilo Krummrich [this message]
2024-07-04 18:37 ` [PATCH v2 26/37] drm/nouveau/nvif: remove disp chan rd/wr Ben Skeggs
2024-07-04 18:37 ` [PATCH v2 27/37] drm/nouveau: move nvxx_* definitions to nouveau_drv.h Ben Skeggs
2024-07-09 16:31 ` Danilo Krummrich
2024-07-18 7:58 ` Ben Skeggs
2024-07-19 12:28 ` Danilo Krummrich
2024-07-26 4:35 ` Ben Skeggs
2024-07-04 18:37 ` [PATCH v2 28/37] drm/nouveau: add nvif_mmu to nouveau_drm Ben Skeggs
2024-07-09 16:34 ` Danilo Krummrich
2024-07-18 8:10 ` Ben Skeggs
2024-07-19 12:47 ` Danilo Krummrich
2024-07-04 18:37 ` [PATCH v2 29/37] drm/nouveau: pass drm to nouveau_mem_new(), instead of cli Ben Skeggs
2024-07-04 18:37 ` [PATCH v2 30/37] drm/nouveau: pass drm to nv50_dmac_create(), rather than device+disp Ben Skeggs
2024-07-04 18:37 ` [PATCH v2 31/37] drm/nouveau: pass cli to nouveau_channel_new() instead of drm+device Ben Skeggs
2024-07-04 18:37 ` [PATCH v2 32/37] drm/nouveau: remove nouveau_chan.device Ben Skeggs
2024-07-04 18:37 ` [PATCH v2 33/37] drm/nouveau: remove chan->drm Ben Skeggs
2024-07-04 18:37 ` [PATCH v2 34/37] drm/nouveau: remove master Ben Skeggs
2024-07-09 16:38 ` Danilo Krummrich
2024-07-18 8:12 ` Ben Skeggs
2024-07-19 12:49 ` Danilo Krummrich
2024-07-04 18:37 ` [PATCH v2 35/37] drm/nouveau: remove push pointer from nouveau_channel Ben Skeggs
2024-07-04 18:37 ` [PATCH v2 36/37] drm/nouveau/kms: remove a few unused struct members and fn decls Ben Skeggs
2024-07-04 18:37 ` [PATCH v2 37/37] drm/nouveau/kms: remove push pointer from nv50_dmac Ben Skeggs
2024-07-09 14:44 ` [PATCH v2 00/37] drm/nouveau: misc. cleanups and removal of unused apis Danilo Krummrich
2024-07-18 7:00 ` Ben Skeggs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Zo1j1pgulLoXrCWq@pollux \
--to=dakr@redhat.com \
--cc=bskeggs@nvidia.com \
--cc=nouveau@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.