openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nv30-nv40/fb: make use of bankoff for zeta buffers, where supported 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2012-10-10 10:41:04 +10:00
parent d33db63b37
commit 150ccf161f
5 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/nouveau/core/include/subdev/fb.h
View File

@ -148,6 +148,9 @@ int nv41_fb_init(struct nouveau_object *);
int nv44_fb_init(struct nouveau_object *); int nv44_fb_init(struct nouveau_object *);
void nv41_fb_tile_prog(struct nouveau_fb *, int, struct nouveau_fb_tile *); void nv41_fb_tile_prog(struct nouveau_fb *, int, struct nouveau_fb_tile *);
void nv46_fb_tile_init(struct nouveau_fb *, int i, u32 addr, u32 size,
u32 pitch, u32 flags, struct nouveau_fb_tile *);
void nv50_fb_vram_del(struct nouveau_fb *, struct nouveau_mem **); void nv50_fb_vram_del(struct nouveau_fb *, struct nouveau_mem **);
void nv50_fb_trap(struct nouveau_fb *, int display); void nv50_fb_trap(struct nouveau_fb *, int display);

7
drivers/gpu/drm/nouveau/core/subdev/fb/nv30.c
View File

@ -34,7 +34,12 @@ void
nv30_fb_tile_init(struct nouveau_fb *pfb, int i, u32 addr, u32 size, u32 pitch, nv30_fb_tile_init(struct nouveau_fb *pfb, int i, u32 addr, u32 size, u32 pitch,
u32 flags, struct nouveau_fb_tile *tile) u32 flags, struct nouveau_fb_tile *tile)
{ {
tile->addr = addr | 1; /* for performance, select alternate bank offset for zeta */
if (!(flags & 4)) tile->addr = (0 << 4);
else tile->addr = (1 << 4);
tile->addr |= 0x00000001; /* enable */
tile->addr |= addr;
tile->limit = max(1u, addr + size) - 1; tile->limit = max(1u, addr + size) - 1;
tile->pitch = pitch; tile->pitch = pitch;
} }

12
drivers/gpu/drm/nouveau/core/subdev/fb/nv44.c
View File

@ -30,6 +30,16 @@ struct nv44_fb_priv {
struct nouveau_fb base; struct nouveau_fb base;
}; };
static void
nv44_fb_tile_init(struct nouveau_fb *pfb, int i, u32 addr, u32 size, u32 pitch,
u32 flags, struct nouveau_fb_tile *tile)
{
tile->addr = 0x00000001; /* mode = vram */
tile->addr |= addr;
tile->limit = max(1u, addr + size) - 1;
tile->pitch = pitch;
}
int int
nv44_fb_init(struct nouveau_object *object) nv44_fb_init(struct nouveau_object *object)
{ {
@ -72,7 +82,7 @@ nv44_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
priv->base.memtype_valid = nv04_fb_memtype_valid; priv->base.memtype_valid = nv04_fb_memtype_valid;
priv->base.tile.regions = 12; priv->base.tile.regions = 12;
priv->base.tile.init = nv30_fb_tile_init; priv->base.tile.init = nv44_fb_tile_init;
priv->base.tile.fini = nv30_fb_tile_fini; priv->base.tile.fini = nv30_fb_tile_fini;
priv->base.tile.prog = nv41_fb_tile_prog; priv->base.tile.prog = nv41_fb_tile_prog;
return nouveau_fb_created(&priv->base); return nouveau_fb_created(&priv->base);

16
drivers/gpu/drm/nouveau/core/subdev/fb/nv46.c
View File

@ -30,6 +30,20 @@ struct nv46_fb_priv {
struct nouveau_fb base; struct nouveau_fb base;
}; };
void
nv46_fb_tile_init(struct nouveau_fb *pfb, int i, u32 addr, u32 size, u32 pitch,
u32 flags, struct nouveau_fb_tile *tile)
{
/* for performance, select alternate bank offset for zeta */
if (!(flags & 4)) tile->addr = (0 << 3);
else tile->addr = (1 << 3);
tile->addr |= 0x00000001; /* mode = vram */
tile->addr |= addr;
tile->limit = max(1u, addr + size) - 1;
tile->pitch = pitch;
}
static int static int
nv46_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine, nv46_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size, struct nouveau_oclass *oclass, void *data, u32 size,
@ -57,7 +71,7 @@ nv46_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
priv->base.memtype_valid = nv04_fb_memtype_valid; priv->base.memtype_valid = nv04_fb_memtype_valid;
priv->base.tile.regions = 15; priv->base.tile.regions = 15;
priv->base.tile.init = nv30_fb_tile_init; priv->base.tile.init = nv46_fb_tile_init;
priv->base.tile.fini = nv30_fb_tile_fini; priv->base.tile.fini = nv30_fb_tile_fini;
priv->base.tile.prog = nv41_fb_tile_prog; priv->base.tile.prog = nv41_fb_tile_prog;
return nouveau_fb_created(&priv->base); return nouveau_fb_created(&priv->base);

2
drivers/gpu/drm/nouveau/core/subdev/fb/nv4e.c
View File

@ -48,7 +48,7 @@ nv4e_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
priv->base.ram.type = NV_MEM_TYPE_STOLEN; priv->base.ram.type = NV_MEM_TYPE_STOLEN;
priv->base.memtype_valid = nv04_fb_memtype_valid; priv->base.memtype_valid = nv04_fb_memtype_valid;
priv->base.tile.regions = 12; priv->base.tile.regions = 12;
priv->base.tile.init = nv30_fb_tile_init; priv->base.tile.init = nv46_fb_tile_init;
priv->base.tile.fini = nv30_fb_tile_fini; priv->base.tile.fini = nv30_fb_tile_fini;
priv->base.tile.prog = nv41_fb_tile_prog; priv->base.tile.prog = nv41_fb_tile_prog;
return nouveau_fb_created(&priv->base); return nouveau_fb_created(&priv->base);