UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau: move set_tile_region to nouveau_exec_engine 

In the very least VPE (PMPEG and friends) also has this style of tile
region regs, lets make them just work if/when they get added.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2011-04-01 13:10:45 +10:00
parent 4976986bd4
commit 96c5008290
6 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/nouveau/nouveau_drv.h
View File

@ -302,6 +302,7 @@ struct nouveau_exec_engine {
void (*context_del)(struct nouveau_channel *, int engine); void (*context_del)(struct nouveau_channel *, int engine);
int (*object_new)(struct nouveau_channel *, int engine, int (*object_new)(struct nouveau_channel *, int engine,
u32 handle, u16 class); u32 handle, u16 class);
void (*set_tile_region)(struct drm_device *dev, int i);
void (*tlb_flush)(struct drm_device *, int engine); void (*tlb_flush)(struct drm_device *, int engine);
}; };
@ -393,7 +394,6 @@ struct nouveau_pgraph_engine {
int (*object_new)(struct nouveau_channel *chan, u32 handle, u16 class); int (*object_new)(struct nouveau_channel *chan, u32 handle, u16 class);
void (*tlb_flush)(struct drm_device *dev); void (*tlb_flush)(struct drm_device *dev);
void (*set_tile_region)(struct drm_device *dev, int i);
}; };
struct nouveau_display_engine { struct nouveau_display_engine {
@ -1151,18 +1151,15 @@ extern struct nouveau_bitfield nv04_graph_nsource[];
/* nv10_graph.c */ /* nv10_graph.c */
extern int nv10_graph_create(struct drm_device *); extern int nv10_graph_create(struct drm_device *);
extern struct nouveau_channel *nv10_graph_channel(struct drm_device *); extern struct nouveau_channel *nv10_graph_channel(struct drm_device *);
extern void nv10_graph_set_tile_region(struct drm_device *dev, int i);
extern struct nouveau_bitfield nv10_graph_intr[]; extern struct nouveau_bitfield nv10_graph_intr[];
extern struct nouveau_bitfield nv10_graph_nstatus[]; extern struct nouveau_bitfield nv10_graph_nstatus[];
/* nv20_graph.c */ /* nv20_graph.c */
extern int nv20_graph_create(struct drm_device *); extern int nv20_graph_create(struct drm_device *);
extern void nv20_graph_set_tile_region(struct drm_device *dev, int i);
/* nv40_graph.c */ /* nv40_graph.c */
extern int nv40_graph_create(struct drm_device *); extern int nv40_graph_create(struct drm_device *);
extern void nv40_grctx_init(struct nouveau_grctx *); extern void nv40_grctx_init(struct nouveau_grctx *);
extern void nv40_graph_set_tile_region(struct drm_device *dev, int i);
/* nv50_graph.c */ /* nv50_graph.c */
extern int nv50_graph_create(struct drm_device *); extern int nv50_graph_create(struct drm_device *);

8
drivers/gpu/drm/nouveau/nouveau_mem.c
View File

@ -51,8 +51,7 @@ nv10_mem_update_tile_region(struct drm_device *dev,
struct drm_nouveau_private *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo; struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
struct nouveau_fb_engine *pfb = &dev_priv->engine.fb; struct nouveau_fb_engine *pfb = &dev_priv->engine.fb;
struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph; int i = tile - dev_priv->tile.reg, j;
int i = tile - dev_priv->tile.reg;
unsigned long save; unsigned long save;
nouveau_fence_unref(&tile->fence); nouveau_fence_unref(&tile->fence);
@ -70,7 +69,10 @@ nv10_mem_update_tile_region(struct drm_device *dev,
nouveau_wait_for_idle(dev); nouveau_wait_for_idle(dev);
pfb->set_tile_region(dev, i); pfb->set_tile_region(dev, i);
pgraph->set_tile_region(dev, i); for (j = 0; j < NVOBJ_ENGINE_NR; j++) {
if (dev_priv->eng[j] && dev_priv->eng[j]->set_tile_region)
dev_priv->eng[j]->set_tile_region(dev, i);
}
pfifo->cache_pull(dev, true); pfifo->cache_pull(dev, true);
pfifo->reassign(dev, true); pfifo->reassign(dev, true);

4
drivers/gpu/drm/nouveau/nouveau_state.c
View File

@ -121,7 +121,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
engine->graph.takedown = nouveau_stub_takedown; engine->graph.takedown = nouveau_stub_takedown;
engine->graph.channel = nvc0_graph_channel; engine->graph.channel = nvc0_graph_channel;
engine->graph.fifo_access = nvc0_graph_fifo_access; engine->graph.fifo_access = nvc0_graph_fifo_access;
engine->graph.set_tile_region = nv10_graph_set_tile_region;
engine->fifo.channels = 32; engine->fifo.channels = 32;
engine->fifo.init = nv10_fifo_init; engine->fifo.init = nv10_fifo_init;
engine->fifo.takedown = nv04_fifo_fini; engine->fifo.takedown = nv04_fifo_fini;
@ -174,7 +173,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
engine->graph.takedown = nouveau_stub_takedown; engine->graph.takedown = nouveau_stub_takedown;
engine->graph.channel = nvc0_graph_channel; engine->graph.channel = nvc0_graph_channel;
engine->graph.fifo_access = nvc0_graph_fifo_access; engine->graph.fifo_access = nvc0_graph_fifo_access;
engine->graph.set_tile_region = nv20_graph_set_tile_region;
engine->fifo.channels = 32; engine->fifo.channels = 32;
engine->fifo.init = nv10_fifo_init; engine->fifo.init = nv10_fifo_init;
engine->fifo.takedown = nv04_fifo_fini; engine->fifo.takedown = nv04_fifo_fini;
@ -227,7 +225,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
engine->graph.takedown = nouveau_stub_takedown; engine->graph.takedown = nouveau_stub_takedown;
engine->graph.channel = nvc0_graph_channel; engine->graph.channel = nvc0_graph_channel;
engine->graph.fifo_access = nvc0_graph_fifo_access; engine->graph.fifo_access = nvc0_graph_fifo_access;
engine->graph.set_tile_region = nv20_graph_set_tile_region;
engine->fifo.channels = 32; engine->fifo.channels = 32;
engine->fifo.init = nv10_fifo_init; engine->fifo.init = nv10_fifo_init;
engine->fifo.takedown = nv04_fifo_fini; engine->fifo.takedown = nv04_fifo_fini;
@ -283,7 +280,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
engine->graph.takedown = nouveau_stub_takedown; engine->graph.takedown = nouveau_stub_takedown;
engine->graph.fifo_access = nvc0_graph_fifo_access; engine->graph.fifo_access = nvc0_graph_fifo_access;
engine->graph.channel = nvc0_graph_channel; engine->graph.channel = nvc0_graph_channel;
engine->graph.set_tile_region = nv40_graph_set_tile_region;
engine->fifo.channels = 32; engine->fifo.channels = 32;
engine->fifo.init = nv40_fifo_init; engine->fifo.init = nv40_fifo_init;
engine->fifo.takedown = nv04_fifo_fini; engine->fifo.takedown = nv04_fifo_fini;

3
drivers/gpu/drm/nouveau/nv10_graph.c
View File

@ -893,7 +893,7 @@ nv10_graph_context_del(struct nouveau_channel *chan, int engine)
kfree(pgraph_ctx); kfree(pgraph_ctx);
} }
void static void
nv10_graph_set_tile_region(struct drm_device *dev, int i) nv10_graph_set_tile_region(struct drm_device *dev, int i)
{ {
struct drm_nouveau_private *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
@ -1143,6 +1143,7 @@ nv10_graph_create(struct drm_device *dev)
pgraph->base.context_new = nv10_graph_context_new; pgraph->base.context_new = nv10_graph_context_new;
pgraph->base.context_del = nv10_graph_context_del; pgraph->base.context_del = nv10_graph_context_del;
pgraph->base.object_new = nv04_graph_object_new; pgraph->base.object_new = nv04_graph_object_new;
pgraph->base.set_tile_region = nv10_graph_set_tile_region;
NVOBJ_ENGINE_ADD(dev, GR, &pgraph->base); NVOBJ_ENGINE_ADD(dev, GR, &pgraph->base);
nouveau_irq_register(dev, 12, nv10_graph_isr); nouveau_irq_register(dev, 12, nv10_graph_isr);

3
drivers/gpu/drm/nouveau/nv20_graph.c
View File

@ -470,7 +470,7 @@ nv20_graph_context_del(struct nouveau_channel *chan, int engine)
chan->engctx[engine] = NULL; chan->engctx[engine] = NULL;
} }
void static void
nv20_graph_set_tile_region(struct drm_device *dev, int i) nv20_graph_set_tile_region(struct drm_device *dev, int i)
{ {
struct drm_nouveau_private *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
@ -730,6 +730,7 @@ nv20_graph_create(struct drm_device *dev)
pgraph->base.context_new = nv20_graph_context_new; pgraph->base.context_new = nv20_graph_context_new;
pgraph->base.context_del = nv20_graph_context_del; pgraph->base.context_del = nv20_graph_context_del;
pgraph->base.object_new = nv04_graph_object_new; pgraph->base.object_new = nv04_graph_object_new;
pgraph->base.set_tile_region = nv20_graph_set_tile_region;
pgraph->grctx_user = 0x0028; pgraph->grctx_user = 0x0028;
if (dev_priv->card_type == NV_20) { if (dev_priv->card_type == NV_20) {

3
drivers/gpu/drm/nouveau/nv40_graph.c
View File

@ -207,7 +207,7 @@ nv40_graph_object_new(struct nouveau_channel *chan, int engine,
return ret; return ret;
} }
void static void
nv40_graph_set_tile_region(struct drm_device *dev, int i) nv40_graph_set_tile_region(struct drm_device *dev, int i)
{ {
struct drm_nouveau_private *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
@ -525,6 +525,7 @@ nv40_graph_create(struct drm_device *dev)
pgraph->base.context_new = nv40_graph_context_new; pgraph->base.context_new = nv40_graph_context_new;
pgraph->base.context_del = nv40_graph_context_del; pgraph->base.context_del = nv40_graph_context_del;
pgraph->base.object_new = nv40_graph_object_new; pgraph->base.object_new = nv40_graph_object_new;
pgraph->base.set_tile_region = nv40_graph_set_tile_region;
NVOBJ_ENGINE_ADD(dev, GR, &pgraph->base); NVOBJ_ENGINE_ADD(dev, GR, &pgraph->base);
nouveau_irq_register(dev, 12, nv40_graph_isr); nouveau_irq_register(dev, 12, nv40_graph_isr);