p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/nouveau/sec: switch to subdev printk macros 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-08-20 14:54:13 +10:00
parent 476901ff6c
commit 9e3911e5b2
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/include/nvkm/core/enum.h
View File

@ -10,7 +10,6 @@ struct nvkm_enum {
}; };
const struct nvkm_enum *nvkm_enum_find(const struct nvkm_enum *, u32 value); const struct nvkm_enum *nvkm_enum_find(const struct nvkm_enum *, u32 value);
const struct nvkm_enum *nvkm_enum_print(const struct nvkm_enum *, u32 value);
struct nvkm_bitfield { struct nvkm_bitfield {
u32 mask; u32 mask;

11
drivers/gpu/drm/nouveau/nvkm/core/enum.c
View File

@ -38,17 +38,6 @@ nvkm_enum_find(const struct nvkm_enum *en, u32 value)
return NULL; return NULL;
} }
const struct nvkm_enum *
nvkm_enum_print(const struct nvkm_enum *en, u32 value)
{
en = nvkm_enum_find(en, value);
if (en)
pr_cont("%s", en->name);
else
pr_cont("(unknown enum 0x%08x)", value);
return en;
}
void void
nvkm_snprintbf(char *data, int size, const struct nvkm_bitfield *bf, u32 value) nvkm_snprintbf(char *data, int size, const struct nvkm_bitfield *bf, u32 value)
{ {

14
drivers/gpu/drm/nouveau/nvkm/engine/sec/g98.c
View File

@ -84,23 +84,25 @@ g98_sec_intr(struct nvkm_subdev *subdev)
u32 mthd = (addr & 0x07ff) << 2; u32 mthd = (addr & 0x07ff) << 2;
u32 subc = (addr & 0x3800) >> 11; u32 subc = (addr & 0x3800) >> 11;
u32 data = nvkm_rd32(device, 0x087044); u32 data = nvkm_rd32(device, 0x087044);
const struct nvkm_enum *en;
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 & 0x00000040) { if (stat & 0x00000040) {
nv_error(sec, "DISPATCH_ERROR ["); en = nvkm_enum_find(g98_sec_isr_error_name, ssta);
nvkm_enum_print(g98_sec_isr_error_name, ssta); nvkm_error(subdev, "DISPATCH_ERROR %04x [%s] "
pr_cont("] ch %d [0x%010llx %s] subc %d mthd 0x%04x data 0x%08x\n", "ch %d [%010llx %s] subc %d "
chid, (u64)inst << 12, nvkm_client_name(engctx), "mthd %04x data %08x\n", ssta,
subc, mthd, data); en ? en->name : "", chid, (u64)inst << 12,
nvkm_client_name(engctx), subc, mthd, data);
nvkm_wr32(device, 0x087004, 0x00000040); nvkm_wr32(device, 0x087004, 0x00000040);
stat &= ~0x00000040; stat &= ~0x00000040;
} }
if (stat) { if (stat) {
nv_error(sec, "unhandled intr 0x%08x\n", stat); nvkm_error(subdev, "intr %08x\n", stat);
nvkm_wr32(device, 0x087004, stat); nvkm_wr32(device, 0x087004, stat);
} }