Commit 0c5b8cec authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fifo: add method to lookup fifo chid related to a given object 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 3acec63a

drivers/gpu/drm/nouveau/core/engine/fifo/base.c

+16 −0
Original line number Diff line number Diff line
@@ -132,6 +132,21 @@ _nouveau_fifo_channel_wr32(struct nouveau_object *object, u32 addr, u32 data) 
	iowrite32_native(data, chan->user + addr);

}



int

nouveau_fifo_chid(struct nouveau_fifo *priv, struct nouveau_object *object)

{

	int engidx = nv_hclass(priv) & 0xff;



	while (object && object->parent) {

		if ( nv_iclass(object->parent, NV_ENGCTX_CLASS) &&

		    (nv_hclass(object->parent) & 0xff) == engidx)

			return nouveau_fifo_chan(object)->chid;

		object = object->parent;

	}



	return -1;

}



void

nouveau_fifo_destroy(struct nouveau_fifo *priv)

{
@@ -160,6 +175,7 @@ nouveau_fifo_create_(struct nouveau_object *parent, 
	if (!priv->channel)

		return -ENOMEM;



	priv->chid = nouveau_fifo_chid;

	spin_lock_init(&priv->lock);

	return 0;

}

drivers/gpu/drm/nouveau/core/include/engine/fifo.h

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ struct nouveau_fifo { 
	u16 min;

	u16 max;



	int  (*chid)(struct nouveau_fifo *, struct nouveau_object *);

	void (*pause)(struct nouveau_fifo *, unsigned long *);

	void (*start)(struct nouveau_fifo *, unsigned long *);

};