redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/nouveau/mc: fix (incorrect) reporting of unknown pending intr bits

Browse source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2013-11-05 09:09:30 +10:00
parent 8df1d0c07f
commit 0c0888473d
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/gpu/drm/nouveau/core/subdev/mc/base.c
View file

@ -25,6 +25,15 @@
#include <subdev/mc.h>
#include <core/option.h>
static inline u32
nouveau_mc_intr_mask(struct nouveau_mc *pmc)
{
u32 intr = nv_rd32(pmc, 0x000100);
if (intr == 0xffffffff) /* likely fallen off the bus */
intr = 0x00000000;
return intr;
}
static irqreturn_t
nouveau_mc_intr(int irq, void *arg)
{
@ -37,16 +46,12 @@ nouveau_mc_intr(int irq, void *arg)
nv_wr32(pmc, 0x000140, 0x00000000);
nv_rd32(pmc, 0x000140);
intr = nv_rd32(pmc, 0x000100);
if (intr == 0xffffffff) /* likely fallen off the bus */
intr = 0x00000000;
intr = nouveau_mc_intr_mask(pmc);
if (pmc->use_msi)
oclass->msi_rearm(pmc);
if (intr) {
u32 stat = nv_rd32(pmc, 0x000100);
u32 stat = intr = nouveau_mc_intr_mask(pmc);
while (map->stat) {
if (intr & map->stat) {
unit = nouveau_subdev(pmc, map->unit);