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

drm/nouveau/disp/gv100-: not all channel types support reporting error codes 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2020-01-28 15:03:25 +10:00
parent 0e6176c6d2
commit 86e18ebd87
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c
View File

@ -101,15 +101,26 @@ gv100_disp_exception(struct nv50_disp *disp, int chid)
u32 stat = nvkm_rd32(device, 0x611020 + (chid * 12)); u32 stat = nvkm_rd32(device, 0x611020 + (chid * 12));
u32 type = (stat & 0x00007000) >> 12; u32 type = (stat & 0x00007000) >> 12;
u32 mthd = (stat & 0x00000fff) << 2; u32 mthd = (stat & 0x00000fff) << 2;
u32 data = nvkm_rd32(device, 0x611024 + (chid * 12));
u32 code = nvkm_rd32(device, 0x611028 + (chid * 12));
const struct nvkm_enum *reason = const struct nvkm_enum *reason =
nvkm_enum_find(nv50_disp_intr_error_type, type); nvkm_enum_find(nv50_disp_intr_error_type, type);
nvkm_error(subdev, "chid %d stat %08x reason %d [%s] mthd %04x " /*TODO: Suspect 33->41 are for WRBK channel exceptions, but we
"data %08x code %08x\n", * don't support those currently.
chid, stat, type, reason ? reason->name : "", *
mthd, data, code); * CORE+WIN CHIDs map directly to the FE_EXCEPT() slots.
*/
if (chid <= 32) {
u32 data = nvkm_rd32(device, 0x611024 + (chid * 12));
u32 code = nvkm_rd32(device, 0x611028 + (chid * 12));
nvkm_error(subdev, "chid %d stat %08x reason %d [%s] "
"mthd %04x data %08x code %08x\n",
chid, stat, type, reason ? reason->name : "",
mthd, data, code);
} else {
nvkm_error(subdev, "chid %d stat %08x reason %d [%s] "
"mthd %04x\n",
chid, stat, type, reason ? reason->name : "", mthd);
}
if (chid < ARRAY_SIZE(disp->chan) && disp->chan[chid]) { if (chid < ARRAY_SIZE(disp->chan) && disp->chan[chid]) {
switch (mthd) { switch (mthd) {