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

drm/nouveau/mc: fetch NV_PMC_INTR again after re-arming MSI 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2013-10-11 14:56:39 +10:00
parent ab5beca895
commit 3c792a15ec
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/nouveau/core/subdev/mc/base.c
View File

@ -31,7 +31,7 @@ nouveau_mc_intr(int irq, void *arg)
struct nouveau_mc *pmc = arg;
const struct nouveau_mc_intr *map = pmc->intr_map;
struct nouveau_subdev *unit;
u32 intr, stat;
u32 intr;
nv_wr32(pmc, 0x000140, 0x00000000);
nv_rd32(pmc, 0x000140);
@ -40,7 +40,11 @@ nouveau_mc_intr(int irq, void *arg)
if (intr == 0xffffffff) /* likely fallen off the bus */
intr = 0x00000000;
if ((stat = intr) != 0) {
if (pmc->use_msi)
nv_wr08(pmc, 0x088068, 0xff);
if (intr) {
u32 stat = nv_rd32(pmc, 0x000100);
while (map->stat) {
if (intr & map->stat) {
unit = nouveau_subdev(pmc, map->unit);
@ -51,8 +55,6 @@ nouveau_mc_intr(int irq, void *arg)
map++;
}
if (pmc->use_msi)
nv_wr08(pmc, 0x088068, 0xff);
if (stat)
nv_error(pmc, "unknown intr 0x%08x\n", stat);
}