drm/nouveau/pbus/hwsq: Support strided register writes
Signed-off-by: Roy Spliet <rspliet@eclipso.eu> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
df16896b86
commit
3834b632b2
|
@ -11,17 +11,34 @@ struct hwsq {
|
||||||
struct hwsq_reg {
|
struct hwsq_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 hwsq_reg
|
||||||
|
hwsq_stride(u32 addr, u32 stride, u32 mask)
|
||||||
|
{
|
||||||
|
return (struct hwsq_reg) {
|
||||||
|
.sequence = 0,
|
||||||
|
.force = 0,
|
||||||
|
.addr = addr,
|
||||||
|
.stride = stride,
|
||||||
|
.mask = mask,
|
||||||
|
.data = 0xdeadbeef,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
static inline struct hwsq_reg
|
static inline struct hwsq_reg
|
||||||
hwsq_reg2(u32 addr1, u32 addr2)
|
hwsq_reg2(u32 addr1, u32 addr2)
|
||||||
{
|
{
|
||||||
return (struct hwsq_reg) {
|
return (struct hwsq_reg) {
|
||||||
.sequence = 0,
|
.sequence = 0,
|
||||||
.force = 0,
|
.force = 0,
|
||||||
.addr = { addr1, addr2 },
|
.addr = addr1,
|
||||||
|
.stride = addr2 - addr1,
|
||||||
|
.mask = 0x3,
|
||||||
.data = 0xdeadbeef,
|
.data = 0xdeadbeef,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -29,7 +46,14 @@ hwsq_reg2(u32 addr1, u32 addr2)
|
||||||
static inline struct hwsq_reg
|
static inline struct hwsq_reg
|
||||||
hwsq_reg(u32 addr)
|
hwsq_reg(u32 addr)
|
||||||
{
|
{
|
||||||
return hwsq_reg2(addr, addr);
|
return (struct hwsq_reg) {
|
||||||
|
.sequence = 0,
|
||||||
|
.force = 0,
|
||||||
|
.addr = addr,
|
||||||
|
.stride = 0,
|
||||||
|
.mask = 0x1,
|
||||||
|
.data = 0xdeadbeef,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int
|
static inline int
|
||||||
|
@ -62,18 +86,24 @@ static inline u32
|
||||||
hwsq_rd32(struct hwsq *ram, struct hwsq_reg *reg)
|
hwsq_rd32(struct hwsq *ram, struct hwsq_reg *reg)
|
||||||
{
|
{
|
||||||
if (reg->sequence != ram->sequence)
|
if (reg->sequence != ram->sequence)
|
||||||
reg->data = nv_rd32(ram->subdev, reg->addr[0]);
|
reg->data = nv_rd32(ram->subdev, reg->addr);
|
||||||
return reg->data;
|
return reg->data;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
hwsq_wr32(struct hwsq *ram, struct hwsq_reg *reg, u32 data)
|
hwsq_wr32(struct hwsq *ram, struct hwsq_reg *reg, u32 data)
|
||||||
{
|
{
|
||||||
|
u32 mask, off = 0;
|
||||||
|
|
||||||
reg->sequence = ram->sequence;
|
reg->sequence = ram->sequence;
|
||||||
reg->data = data;
|
reg->data = data;
|
||||||
if (reg->addr[0] != reg->addr[1])
|
|
||||||
nvkm_hwsq_wr32(ram->hwsq, reg->addr[1], reg->data);
|
for (mask = reg->mask; mask > 0; mask = (mask & ~1) >> 1) {
|
||||||
nvkm_hwsq_wr32(ram->hwsq, reg->addr[0], reg->data);
|
if (mask & 1)
|
||||||
|
nvkm_hwsq_wr32(ram->hwsq, reg->addr+off, reg->data);
|
||||||
|
|
||||||
|
off += reg->stride;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
|
|
Loading…
Reference in New Issue