drm/nouveau/dma: lookup objects with nvkm_object_search() (83e85d91) · Commits · 戴 / test

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,6 @@ struct nvkm_client {

		struct nvkm_client_notify *notify[16];
		struct rb_root objroot;
		struct rb_root dmaroot;

		bool super;
		void *data;

+1 −5

Original line number	Diff line number	Diff line
		@@ -12,9 +12,6 @@ struct nvkm_dmaobj {
		u32 access;
		u64 start;
		u64 limit;

		struct rb_node rb;
		u64 handle; /XXX HANDLE MERGE /
		};

		struct nvkm_dma {
		@@ -22,8 +19,7 @@ struct nvkm_dma {
		struct nvkm_engine engine;
		};

		struct nvkm_dmaobj *
		nvkm_dma_search(struct nvkm_dma , struct nvkm_client , u64 object);
		struct nvkm_dmaobj nvkm_dmaobj_search(struct nvkm_client , u64 object);

		int nv04_dma_new(struct nvkm_device , int, struct nvkm_dma *);
		int nv50_dma_new(struct nvkm_device , int, struct nvkm_dma *);

+0 −1

Original line number	Diff line number	Diff line
		@@ -255,6 +255,5 @@ nvkm_client_new(const char name, u64 device, const char cfg,
		client->device = device;
		client->debug = nvkm_dbgopt(dbg, "CLIENT");
		client->objroot = RB_ROOT;
		client->dmaroot = RB_ROOT;
		return 0;
		}

+3 −4

Original line number	Diff line number	Diff line
		@@ -137,7 +137,6 @@ nv50_disp_dmac_new_(const struct nv50_disp_dmac_func *func,
		const struct nvkm_oclass *oclass,
		struct nvkm_object **pobject)
		{
		struct nvkm_device *device = root->disp->base.engine.subdev.device;
		struct nvkm_client *client = oclass->client;
		struct nvkm_dmaobj *dmaobj;
		struct nv50_disp_dmac *chan;
		@@ -153,9 +152,9 @@ nv50_disp_dmac_new_(const struct nv50_disp_dmac_func *func,
		if (ret)
		return ret;

		dmaobj = nvkm_dma_search(device->dma, client, push);
		if (!dmaobj)
		return -ENOENT;
		dmaobj = nvkm_dmaobj_search(client, push);
		if (IS_ERR(dmaobj))
		return PTR_ERR(dmaobj);

		if (dmaobj->limit - dmaobj->start != 0xfff)
		return -EINVAL;

+1 −41

Original line number	Diff line number	Diff line
		@@ -28,24 +28,6 @@

		#include <nvif/class.h>

		struct nvkm_dmaobj *
		nvkm_dma_search(struct nvkm_dma dma, struct nvkm_client client, u64 object)
		{
		struct rb_node *node = client->dmaroot.rb_node;
		while (node) {
		struct nvkm_dmaobj *dmaobj =
		rb_entry(node, typeof(*dmaobj), rb);
		if (object < dmaobj->handle)
		node = node->rb_left;
		else
		if (object > dmaobj->handle)
		node = node->rb_right;
		else
		return dmaobj;
		}
		return NULL;
		}

		static int
		nvkm_dma_oclass_new(struct nvkm_device *device,
		const struct nvkm_oclass oclass, void data, u32 size,
		@@ -53,34 +35,12 @@ nvkm_dma_oclass_new(struct nvkm_device *device,
		{
		struct nvkm_dma *dma = nvkm_dma(oclass->engine);
		struct nvkm_dmaobj *dmaobj = NULL;
		struct nvkm_client *client = oclass->client;
		struct rb_node **ptr = &client->dmaroot.rb_node;
		struct rb_node *parent = NULL;
		int ret;

		ret = dma->func->class_new(dma, oclass, data, size, &dmaobj);
		if (dmaobj)
		*pobject = &dmaobj->object;
		if (ret)
		return ret;

		dmaobj->handle = oclass->object;

		while (*ptr) {
		struct nvkm_dmaobj obj = rb_entry(ptr, typeof(*obj), rb);
		parent = *ptr;
		if (dmaobj->handle < obj->handle)
		ptr = &parent->rb_left;
		else
		if (dmaobj->handle > obj->handle)
		ptr = &parent->rb_right;
		else
		return -EEXIST;
		}

		rb_link_node(&dmaobj->rb, parent, ptr);
		rb_insert_color(&dmaobj->rb, &client->dmaroot);
		return 0;
		}

		static const struct nvkm_device_oclass