Commit 8d7b2d3a authored by Ben Skeggs's avatar Ben Skeggs Committed by Danilo Krummrich
Browse files

drm/nouveau/nvif: remove disp chan rd/wr 



There's no good reason the ioremap() that results from nvif_object_map()
should fail, so add a check that the map succeeded, and remove the rd/wr
methods from display channel objects.

As this was the last user of rd/wr methods, the nvif plumbing is removed
at the same time.

Signed-off-by: default avatarBen Skeggs <bskeggs@nvidia.com>
Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240726043828.58966-27-bskeggs@nvidia.com
parent 216c3c44

drivers/gpu/drm/nouveau/dispnv50/disp.c

+5 −2
Original line number Diff line number Diff line
@@ -93,8 +93,11 @@ nv50_chan_create(struct nvif_device *device, struct nvif_object *disp, 
				ret = nvif_object_ctor(disp, "kmsChan", 0,

						       oclass[0], data, size,

						       &chan->user);

				if (ret == 0)

					nvif_object_map(&chan->user, NULL, 0);

				if (ret == 0) {

					ret = nvif_object_map(&chan->user, NULL, 0);

					if (ret)

						nvif_object_dtor(&chan->user);

				}

				nvif_object_sclass_put(&sclass);

				return ret;

			}

drivers/gpu/drm/nouveau/include/nvif/ioctl.h

+0 −20
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ struct nvif_ioctl_v0 { 
#define NVIF_IOCTL_V0_NEW                                                  0x02

#define NVIF_IOCTL_V0_DEL                                                  0x03

#define NVIF_IOCTL_V0_MTHD                                                 0x04

#define NVIF_IOCTL_V0_RD                                                   0x05

#define NVIF_IOCTL_V0_WR                                                   0x06

#define NVIF_IOCTL_V0_MAP                                                  0x07

#define NVIF_IOCTL_V0_UNMAP                                                0x08

	__u8  type;
@@ -60,24 +58,6 @@ struct nvif_ioctl_mthd_v0 { 
	__u8  data[];		/* method data (class.h) */

};



struct nvif_ioctl_rd_v0 {

	/* nvif_ioctl ... */

	__u8  version;

	__u8  size;

	__u8  pad02[2];

	__u32 data;

	__u64 addr;

};



struct nvif_ioctl_wr_v0 {

	/* nvif_ioctl ... */

	__u8  version;

	__u8  size;

	__u8  pad02[2];

	__u32 data;

	__u64 addr;

};



struct nvif_ioctl_map_v0 {

	/* nvif_ioctl ... */

	__u8  version;

drivers/gpu/drm/nouveau/include/nvif/object.h

+3 −14
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ void nvif_object_dtor(struct nvif_object *); 
int  nvif_object_ioctl(struct nvif_object *, void *, u32, void **);

int  nvif_object_sclass_get(struct nvif_object *, struct nvif_sclass **);

void nvif_object_sclass_put(struct nvif_sclass **);

u32  nvif_object_rd(struct nvif_object *, int, u64);

void nvif_object_wr(struct nvif_object *, int, u64, u32);

int  nvif_object_mthd(struct nvif_object *, u32, void *, u32);

int  nvif_object_map_handle(struct nvif_object *, void *, u32,

			    u64 *handle, u64 *length);
@@ -47,20 +45,11 @@ void nvif_object_unmap(struct nvif_object *); 
#define nvif_object(a) (a)->object



#define nvif_rd(a,f,b,c) ({                                                    \

	struct nvif_object *_object = (a);                                     \

	u32 _data;                                                             \

	if (likely(_object->map.ptr))                                          \

		_data = f((u8 __iomem *)_object->map.ptr + (c));               \

	else                                                                   \

		_data = nvif_object_rd(_object, (b), (c));                     \

	u32 _data = f((u8 __iomem *)(a)->map.ptr + (c));                       \

	_data;                                                                 \

})

#define nvif_wr(a,f,b,c,d) ({                                                  \

	struct nvif_object *_object = (a);                                     \

	if (likely(_object->map.ptr))                                          \

		f((d), (u8 __iomem *)_object->map.ptr + (c));                  \

	else                                                                   \

		nvif_object_wr(_object, (b), (c), (d));                        \

	f((d), (u8 __iomem *)(a)->map.ptr + (c));                              \

})

#define nvif_rd08(a,b) ({ ((u8)nvif_rd((a), ioread8, 1, (b))); })

#define nvif_rd16(a,b) ({ ((u16)nvif_rd((a), ioread16_native, 2, (b))); })
@@ -69,7 +58,7 @@ void nvif_object_unmap(struct nvif_object *); 
#define nvif_wr16(a,b,c) nvif_wr((a), iowrite16_native, 2, (b), (u16)(c))

#define nvif_wr32(a,b,c) nvif_wr((a), iowrite32_native, 4, (b), (u32)(c))

#define nvif_mask(a,b,c,d) ({                                                  \

	struct nvif_object *__object = (a);                                    \

	typeof(a) __object = (a);                                              \

	u32 _addr = (b), _data = nvif_rd32(__object, _addr);                   \

	nvif_wr32(__object, _addr, (_data & ~(c)) | (d));                      \

	_data;                                                                 \

drivers/gpu/drm/nouveau/include/nvkm/core/object.h

+0 −4
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 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 (*rd32)(struct nvkm_object *, u64 addr, u32 *data);

	int (*wr32)(struct nvkm_object *, u64 addr, u32 data);

	int (*bind)(struct nvkm_object *, struct nvkm_gpuobj *, int align,

		    struct nvkm_gpuobj **);

	int (*sclass)(struct nvkm_object *, int index, struct nvkm_oclass *);
@@ -57,8 +55,6 @@ 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_rd32(struct nvkm_object *, u64 addr, u32 *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 **);

drivers/gpu/drm/nouveau/nvif/object.c

+0 −37
Original line number Diff line number Diff line
@@ -97,43 +97,6 @@ nvif_object_sclass_get(struct nvif_object *object, struct nvif_sclass **psclass) 
	return ret;

}



u32

nvif_object_rd(struct nvif_object *object, int size, u64 addr)

{

	struct {

		struct nvif_ioctl_v0 ioctl;

		struct nvif_ioctl_rd_v0 rd;

	} args = {

		.ioctl.type = NVIF_IOCTL_V0_RD,

		.rd.size = size,

		.rd.addr = addr,

	};

	int ret = nvif_object_ioctl(object, &args, sizeof(args), NULL);

	if (ret) {

		/*XXX: warn? */

		return 0;

	}

	return args.rd.data;

}



void

nvif_object_wr(struct nvif_object *object, int size, u64 addr, u32 data)

{

	struct {

		struct nvif_ioctl_v0 ioctl;

		struct nvif_ioctl_wr_v0 wr;

	} args = {

		.ioctl.type = NVIF_IOCTL_V0_WR,

		.wr.size = size,

		.wr.addr = addr,

		.wr.data = data,

	};

	int ret = nvif_object_ioctl(object, &args, sizeof(args), NULL);

	if (ret) {

		/*XXX: warn? */

	}

}



int

nvif_object_mthd(struct nvif_object *object, u32 mthd, void *data, u32 size)

{