kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2012-08-10 14:02:44 +10:00
parent 3acec63aee
commit 0c5b8cecf3
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/gpu/drm/nouveau/core/engine/fifo/base.c
View file

@ -132,6 +132,21 @@ _nouveau_fifo_channel_wr32(struct nouveau_object *object, u32 addr, u32 data)
iowrite32_native(data, chan->user + addr); 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 void
nouveau_fifo_destroy(struct nouveau_fifo *priv) nouveau_fifo_destroy(struct nouveau_fifo *priv)
{ {
@ -160,6 +175,7 @@ nouveau_fifo_create_(struct nouveau_object *parent,
if (!priv->channel) if (!priv->channel)
return -ENOMEM; return -ENOMEM;
priv->chid = nouveau_fifo_chid;
spin_lock_init(&priv->lock); spin_lock_init(&priv->lock);
return 0; return 0;
} }

1
drivers/gpu/drm/nouveau/core/include/engine/fifo.h
View file

@ -70,6 +70,7 @@ struct nouveau_fifo {
u16 min; u16 min;
u16 max; u16 max;
int (*chid)(struct nouveau_fifo *, struct nouveau_object *);
void (*pause)(struct nouveau_fifo *, unsigned long *); void (*pause)(struct nouveau_fifo *, unsigned long *);
void (*start)(struct nouveau_fifo *, unsigned long *); void (*start)(struct nouveau_fifo *, unsigned long *);
}; };