Skip to content

Commit

Permalink
drm/nouveau: move set_tile_region to nouveau_exec_engine
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Ben Skeggs committed May 16, 2011
1 parent 4976986 commit 96c5008
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 14 deletions.
5 changes: 1 addition & 4 deletions drivers/gpu/drm/nouveau/nouveau_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ struct nouveau_exec_engine {
void (*context_del)(struct nouveau_channel *, int engine);
int (*object_new)(struct nouveau_channel *, int engine,
u32 handle, u16 class);
void (*set_tile_region)(struct drm_device *dev, int i);
void (*tlb_flush)(struct drm_device *, int engine);
};

Expand Down Expand Up @@ -393,7 +394,6 @@ struct nouveau_pgraph_engine {
int (*object_new)(struct nouveau_channel *chan, u32 handle, u16 class);
void (*tlb_flush)(struct drm_device *dev);

void (*set_tile_region)(struct drm_device *dev, int i);
};

struct nouveau_display_engine {
Expand Down Expand Up @@ -1151,18 +1151,15 @@ extern struct nouveau_bitfield nv04_graph_nsource[];
/* nv10_graph.c */
extern int nv10_graph_create(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_nstatus[];

/* nv20_graph.c */
extern int nv20_graph_create(struct drm_device *);
extern void nv20_graph_set_tile_region(struct drm_device *dev, int i);

/* nv40_graph.c */
extern int nv40_graph_create(struct drm_device *);
extern void nv40_grctx_init(struct nouveau_grctx *);
extern void nv40_graph_set_tile_region(struct drm_device *dev, int i);

/* nv50_graph.c */
extern int nv50_graph_create(struct drm_device *);
Expand Down
8 changes: 5 additions & 3 deletions drivers/gpu/drm/nouveau/nouveau_mem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ nv10_mem_update_tile_region(struct drm_device *dev,
struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
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;
int i = tile - dev_priv->tile.reg, j;
unsigned long save;

nouveau_fence_unref(&tile->fence);
Expand All @@ -70,7 +69,10 @@ nv10_mem_update_tile_region(struct drm_device *dev,
nouveau_wait_for_idle(dev);

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->reassign(dev, true);
Expand Down
4 changes: 0 additions & 4 deletions drivers/gpu/drm/nouveau/nouveau_state.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
engine->graph.takedown = nouveau_stub_takedown;
engine->graph.channel = nvc0_graph_channel;
engine->graph.fifo_access = nvc0_graph_fifo_access;
engine->graph.set_tile_region = nv10_graph_set_tile_region;
engine->fifo.channels = 32;
engine->fifo.init = nv10_fifo_init;
engine->fifo.takedown = nv04_fifo_fini;
Expand Down Expand Up @@ -174,7 +173,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
engine->graph.takedown = nouveau_stub_takedown;
engine->graph.channel = nvc0_graph_channel;
engine->graph.fifo_access = nvc0_graph_fifo_access;
engine->graph.set_tile_region = nv20_graph_set_tile_region;
engine->fifo.channels = 32;
engine->fifo.init = nv10_fifo_init;
engine->fifo.takedown = nv04_fifo_fini;
Expand Down Expand Up @@ -227,7 +225,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
engine->graph.takedown = nouveau_stub_takedown;
engine->graph.channel = nvc0_graph_channel;
engine->graph.fifo_access = nvc0_graph_fifo_access;
engine->graph.set_tile_region = nv20_graph_set_tile_region;
engine->fifo.channels = 32;
engine->fifo.init = nv10_fifo_init;
engine->fifo.takedown = nv04_fifo_fini;
Expand Down Expand Up @@ -283,7 +280,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
engine->graph.takedown = nouveau_stub_takedown;
engine->graph.fifo_access = nvc0_graph_fifo_access;
engine->graph.channel = nvc0_graph_channel;
engine->graph.set_tile_region = nv40_graph_set_tile_region;
engine->fifo.channels = 32;
engine->fifo.init = nv40_fifo_init;
engine->fifo.takedown = nv04_fifo_fini;
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/nouveau/nv10_graph.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ nv10_graph_context_del(struct nouveau_channel *chan, int engine)
kfree(pgraph_ctx);
}

void
static void
nv10_graph_set_tile_region(struct drm_device *dev, int i)
{
struct drm_nouveau_private *dev_priv = dev->dev_private;
Expand Down Expand Up @@ -1143,6 +1143,7 @@ nv10_graph_create(struct drm_device *dev)
pgraph->base.context_new = nv10_graph_context_new;
pgraph->base.context_del = nv10_graph_context_del;
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);
nouveau_irq_register(dev, 12, nv10_graph_isr);
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/nouveau/nv20_graph.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ nv20_graph_context_del(struct nouveau_channel *chan, int engine)
chan->engctx[engine] = NULL;
}

void
static void
nv20_graph_set_tile_region(struct drm_device *dev, int i)
{
struct drm_nouveau_private *dev_priv = dev->dev_private;
Expand Down Expand Up @@ -730,6 +730,7 @@ nv20_graph_create(struct drm_device *dev)
pgraph->base.context_new = nv20_graph_context_new;
pgraph->base.context_del = nv20_graph_context_del;
pgraph->base.object_new = nv04_graph_object_new;
pgraph->base.set_tile_region = nv20_graph_set_tile_region;

pgraph->grctx_user = 0x0028;
if (dev_priv->card_type == NV_20) {
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/nouveau/nv40_graph.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ nv40_graph_object_new(struct nouveau_channel *chan, int engine,
return ret;
}

void
static void
nv40_graph_set_tile_region(struct drm_device *dev, int i)
{
struct drm_nouveau_private *dev_priv = dev->dev_private;
Expand Down Expand Up @@ -525,6 +525,7 @@ nv40_graph_create(struct drm_device *dev)
pgraph->base.context_new = nv40_graph_context_new;
pgraph->base.context_del = nv40_graph_context_del;
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);
nouveau_irq_register(dev, 12, nv40_graph_isr);
Expand Down

0 comments on commit 96c5008

Please sign in to comment.