iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/nouveau/fb/ram: Support strided regs

Browse Source 
Signed-off-by: Roy Spliet <rspliet@eclipso.eu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Roy Spliet 2014-09-12 18:00:15 +02:00 committed by Ben Skeggs
parent de1c4e281b
commit 930da220bf
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/gpu/drm/nouveau/core/subdev/fb/ramfuc.h
View File

@ -12,16 +12,32 @@ struct ramfuc {
struct ramfuc_reg { struct ramfuc_reg {
int sequence; int sequence;
bool force; bool force;
u32 addr[2]; u32 addr;
u32 stride; /* in bytes */
u32 mask;
u32 data; u32 data;
}; };
static inline struct ramfuc_reg
ramfuc_stride(u32 addr, u32 stride, u32 mask)
{
return (struct ramfuc_reg) {
.sequence = 0,
.addr = addr,
.stride = stride,
.mask = mask,
.data = 0xdeadbeef,
};
}
static inline struct ramfuc_reg static inline struct ramfuc_reg
ramfuc_reg2(u32 addr1, u32 addr2) ramfuc_reg2(u32 addr1, u32 addr2)
{ {
return (struct ramfuc_reg) { return (struct ramfuc_reg) {
.sequence = 0, .sequence = 0,
.addr = { addr1, addr2 }, .addr = addr1,
.stride = addr2 - addr1,
.mask = 0x3,
.data = 0xdeadbeef, .data = 0xdeadbeef,
}; };
} }
@ -29,7 +45,13 @@ ramfuc_reg2(u32 addr1, u32 addr2)
static noinline struct ramfuc_reg static noinline struct ramfuc_reg
ramfuc_reg(u32 addr) ramfuc_reg(u32 addr)
{ {
return ramfuc_reg2(addr, addr); return (struct ramfuc_reg) {
.sequence = 0,
.addr = addr,
.stride = 0,
.mask = 0x1,
.data = 0xdeadbeef,
};
} }
static inline int static inline int
@ -62,18 +84,25 @@ static inline u32
ramfuc_rd32(struct ramfuc *ram, struct ramfuc_reg *reg) ramfuc_rd32(struct ramfuc *ram, struct ramfuc_reg *reg)
{ {
if (reg->sequence != ram->sequence) if (reg->sequence != ram->sequence)
reg->data = nv_rd32(ram->pfb, reg->addr[0]); reg->data = nv_rd32(ram->pfb, reg->addr);
return reg->data; return reg->data;
} }
static inline void static inline void
ramfuc_wr32(struct ramfuc *ram, struct ramfuc_reg *reg, u32 data) ramfuc_wr32(struct ramfuc *ram, struct ramfuc_reg *reg, u32 data)
{ {
unsigned int mask, off = 0;
reg->sequence = ram->sequence; reg->sequence = ram->sequence;
reg->data = data; reg->data = data;
if (reg->addr[0] != reg->addr[1])
nouveau_memx_wr32(ram->memx, reg->addr[1], reg->data); for (mask = reg->mask; mask > 0; mask = (mask & ~1) >> 1) {
nouveau_memx_wr32(ram->memx, reg->addr[0], reg->data); if (mask & 1) {
nouveau_memx_wr32(ram->memx, reg->addr+off, reg->data);
}
off += reg->stride;
}
} }
static inline void static inline void
@ -125,7 +154,7 @@ ramfuc_unblock(struct ramfuc *ram)
#define ram_init(s,p) ramfuc_init(&(s)->base, (p)) #define ram_init(s,p) ramfuc_init(&(s)->base, (p))
#define ram_exec(s,e) ramfuc_exec(&(s)->base, (e)) #define ram_exec(s,e) ramfuc_exec(&(s)->base, (e))
#define ram_have(s,r) ((s)->r_##r.addr[0] != 0x000000) #define ram_have(s,r) ((s)->r_##r.addr != 0x000000)
#define ram_rd32(s,r) ramfuc_rd32(&(s)->base, &(s)->r_##r) #define ram_rd32(s,r) ramfuc_rd32(&(s)->base, &(s)->r_##r)
#define ram_wr32(s,r,d) ramfuc_wr32(&(s)->base, &(s)->r_##r, (d)) #define ram_wr32(s,r,d) ramfuc_wr32(&(s)->base, &(s)->r_##r, (d))
#define ram_nuke(s,r) ramfuc_nuke(&(s)->base, &(s)->r_##r) #define ram_nuke(s,r) ramfuc_nuke(&(s)->base, &(s)->r_##r)

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

@ -237,7 +237,7 @@ nve0_ram_nuts(struct nve0_ram *ram, struct ramfuc_reg *reg,
{ {
struct nve0_fb_priv *priv = (void *)nouveau_fb(ram); struct nve0_fb_priv *priv = (void *)nouveau_fb(ram);
struct ramfuc *fuc = &ram->fuc.base; struct ramfuc *fuc = &ram->fuc.base;
u32 addr = 0x110000 + (reg->addr[0] & 0xfff); u32 addr = 0x110000 + (reg->addr & 0xfff);
u32 mask = _mask | _copy; u32 mask = _mask | _copy;
u32 data = (_data & _mask) | (reg->data & _copy); u32 data = (_data & _mask) | (reg->data & _copy);
u32 i; u32 i;