mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

drm/nouveau/cipher: switch to subdev printk macros

Browse source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-08-20 14:54:12 +10:00
parent 1eed206fa2
commit 65850a3b40
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c
View file

@ -113,17 +113,18 @@ g84_cipher_intr(struct nvkm_subdev *subdev)
u32 mthd = nvkm_rd32(device, 0x102190); u32 mthd = nvkm_rd32(device, 0x102190);
u32 data = nvkm_rd32(device, 0x102194); u32 data = nvkm_rd32(device, 0x102194);
u32 inst = nvkm_rd32(device, 0x102188) & 0x7fffffff; u32 inst = nvkm_rd32(device, 0x102188) & 0x7fffffff;
char msg[128];
int chid; int chid;
engctx = nvkm_engctx_get(engine, inst); engctx = nvkm_engctx_get(engine, inst);
chid = fifo->chid(fifo, engctx); chid = fifo->chid(fifo, engctx);
if (stat) { if (stat) {
nv_error(cipher, "%s", ""); nvkm_snprintbf(msg, sizeof(msg), g84_cipher_intr_mask, stat);
nvkm_bitfield_print(g84_cipher_intr_mask, stat); nvkm_error(subdev, "%08x [%s] ch %d [%010llx %s] "
pr_cont(" ch %d [0x%010llx %s] mthd 0x%04x data 0x%08x\n", "mthd %04x data %08x\n",
chid, (u64)inst << 12, nvkm_client_name(engctx), stat, msg, chid, (u64)inst << 12,
mthd, data); nvkm_client_name(engctx), mthd, data);
} }
nvkm_wr32(device, 0x102130, stat); nvkm_wr32(device, 0x102130, stat);