Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 345453
b: refs/heads/master
c: e0cdd1e
h: refs/heads/master
i:
  345451: 30704b0
v: v3
  • Loading branch information
Ben Skeggs committed Nov 28, 2012
1 parent 784f22d commit a7573ac
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3cb0ebddd05b5bbdbd7d7214ee6983a034a0b0be
refs/heads/master: e0cdd1e5451efb46515804550aa7eaa9672b0cf0
8 changes: 4 additions & 4 deletions trunk/drivers/gpu/drm/nouveau/core/subdev/mc/base.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@ nouveau_mc_intr(struct nouveau_subdev *subdev)
struct nouveau_mc *pmc = nouveau_mc(subdev);
const struct nouveau_mc_intr *map = pmc->intr_map;
struct nouveau_subdev *unit;
u32 stat;
u32 stat, intr;

stat = nv_rd32(pmc, 0x000100);
intr = stat = nv_rd32(pmc, 0x000100);
while (stat && map->stat) {
if (stat & map->stat) {
unit = nouveau_subdev(subdev, map->unit);
if (unit && unit->intr)
unit->intr(unit);
stat &= ~map->stat;
intr &= ~map->stat;
}
map++;
}

if (stat) {
if (intr) {
nv_error(pmc, "unknown intr 0x%08x\n", stat);
}
}

0 comments on commit a7573ac

Please sign in to comment.