Commit 7ac29332 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fifo: add new engine object handling 



Simplifies the GPU-specific code, completing the switch to newer HALs.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 8ab849d6

drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c

+0 −66
Original line number Diff line number Diff line
@@ -39,70 +39,6 @@ const struct nvkm_event_func 
nvkm_chan_event = {

};



struct nvkm_fifo_chan_object {

	struct nvkm_oproxy oproxy;

	struct nvkm_fifo_chan *chan;

	int hash;

};



static void

nvkm_fifo_chan_child_del(struct nvkm_oproxy *base)

{

	struct nvkm_fifo_chan_object *object =

		container_of(base, typeof(*object), oproxy);

	struct nvkm_fifo_chan *chan = object->chan;



	if (chan->func->object_dtor)

		chan->func->object_dtor(chan, object->hash);

}



static const struct nvkm_oproxy_func

nvkm_fifo_chan_child_func = {

	.dtor[0] = nvkm_fifo_chan_child_del,

};



int

nvkm_fifo_chan_child_new(const struct nvkm_oclass *oclass, void *data, u32 size,

			 struct nvkm_object **pobject)

{

	struct nvkm_engine *engine = oclass->engine;

	struct nvkm_fifo_chan *chan = nvkm_fifo_chan(oclass->parent);

	struct nvkm_ectx *engn = nvkm_list_find(engn, &chan->cgrp->ectxs, head,

						engn->engn->engine == engine);

	struct nvkm_fifo_chan_object *object;

	int ret = 0;



	if (!(object = kzalloc(sizeof(*object), GFP_KERNEL)))

		return -ENOMEM;

	nvkm_oproxy_ctor(&nvkm_fifo_chan_child_func, oclass, &object->oproxy);

	object->chan = chan;

	*pobject = &object->oproxy.base;





	ret = oclass->base.ctor(&(const struct nvkm_oclass) {

					.base = oclass->base,

					.engn = oclass->engn,

					.handle = oclass->handle,

					.object = oclass->object,

					.client = oclass->client,

					.parent = engn->object ?

						  engn->object :

						  oclass->parent,

					.engine = engine,

				}, data, size, &object->oproxy.object);

	if (ret)

		return ret;



	if (chan->func->object_ctor) {

		object->hash =

			chan->func->object_ctor(chan, object->oproxy.object);

		if (object->hash < 0)

			return object->hash;

	}



	return 0;

}



void

nvkm_chan_cctx_bind(struct nvkm_chan *chan, struct nvkm_engn *engn, struct nvkm_cctx *cctx)

{
@@ -455,8 +391,6 @@ nvkm_fifo_chan_ctor(const struct nvkm_fifo_chan_func *fn, 


	*func = *fifo->func->chan.func;

	func->dtor = fn->dtor;

	func->object_ctor = fn->object_ctor;

	func->object_dtor = fn->object_dtor;



	chan->func = func;

	chan->id = -1;

drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h

+0 −4
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ struct nvkm_chan_func { 
	u32 (*doorbell_handle)(struct nvkm_chan *);



	void *(*dtor)(struct nvkm_fifo_chan *);

	int  (*object_ctor)(struct nvkm_fifo_chan *, struct nvkm_object *);

	void (*object_dtor)(struct nvkm_fifo_chan *, int);

};



int nvkm_fifo_chan_ctor(const struct nvkm_fifo_chan_func *, struct nvkm_fifo *,
@@ -78,6 +76,4 @@ void nvkm_chan_cctx_bind(struct nvkm_chan *, struct nvkm_engn *, struct nvkm_cct 
#define CHAN_PRINT(c,l,p,f,a...) CGRP_PRINT((c)->cgrp, l, p, "%04x:"f, (c)->id, ##a)

#define CHAN_ERROR(c,f,a...) CHAN_PRCLI((c), ERROR,    err, " "f"\n", ##a)

#define CHAN_TRACE(c,f,a...) CHAN_PRINT((c), TRACE,   info, " "f"\n", ##a)



int nvkm_fifo_chan_child_new(const struct nvkm_oclass *, void *, u32, struct nvkm_object **);

#endif

drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c

+0 −34
Original line number Diff line number Diff line
@@ -30,42 +30,9 @@ 


#include <nvif/cl826e.h>



static int

g84_fifo_chan_object_ctor(struct nvkm_fifo_chan *base,

			  struct nvkm_object *object)

{

	struct nv50_fifo_chan *chan = nv50_fifo_chan(base);

	u32 handle = object->handle;

	u32 context;



	switch (object->engine->subdev.type) {

	case NVKM_ENGINE_DMAOBJ:

	case NVKM_ENGINE_SW    : context = 0x00000000; break;

	case NVKM_ENGINE_GR    : context = 0x00100000; break;

	case NVKM_ENGINE_MPEG  :

	case NVKM_ENGINE_MSPPP : context = 0x00200000; break;

	case NVKM_ENGINE_ME    :

	case NVKM_ENGINE_CE    : context = 0x00300000; break;

	case NVKM_ENGINE_VP    :

	case NVKM_ENGINE_MSPDEC: context = 0x00400000; break;

	case NVKM_ENGINE_CIPHER:

	case NVKM_ENGINE_SEC   :

	case NVKM_ENGINE_VIC   : context = 0x00500000; break;

	case NVKM_ENGINE_BSP   :

	case NVKM_ENGINE_MSVLD : context = 0x00600000; break;

	default:

		WARN_ON(1);

		return -EINVAL;

	}



	return nvkm_ramht_insert(chan->ramht, object, 0, 4, handle, context);

}



static const struct nvkm_fifo_chan_func

g84_fifo_chan_func = {

	.dtor = nv50_fifo_chan_dtor,

	.object_ctor = g84_fifo_chan_object_ctor,

	.object_dtor = nv50_fifo_chan_object_dtor,

};



int
@@ -95,6 +62,5 @@ g84_fifo_chan_ctor(struct nv50_fifo *fifo, u64 vmm, u64 push, 
				  BIT(G84_FIFO_ENGN_MSVLD) |

				  BIT(G84_FIFO_ENGN_DMA),

				  0, 0xc00000, 0x2000, oclass, &chan->base);

	chan->fifo = fifo;

	return ret;

}

drivers/gpu/drm/nouveau/nvkm/engine/fifo/changf100.h

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 


struct gf100_fifo_chan {

	struct nvkm_fifo_chan base;

	struct gf100_fifo *fifo;



#define GF100_FIFO_ENGN_GR     0

#define GF100_FIFO_ENGN_MSPDEC 1

drivers/gpu/drm/nouveau/nvkm/engine/fifo/changk104.h

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 


struct gk104_fifo_chan {

	struct nvkm_fifo_chan base;

	struct gk104_fifo *fifo;

	int runl;



#define GK104_FIFO_ENGN_SW 15