Commit c81a51f0 authored by Alistair Popple's avatar Alistair Popple Committed by Ben Skeggs

drm/nouveau/mc/tu102: Remove Turing interrupt hack

This is no longer needed now that tu102_mc_intr_stat has been updated to
look at the correct top-level interrupt bits.
Signed-off-by: default avatarAlistair Popple <apopple@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent c3cc12ea
...@@ -108,9 +108,6 @@ nvkm_mc_intr(struct nvkm_device *device, bool *handled) ...@@ -108,9 +108,6 @@ nvkm_mc_intr(struct nvkm_device *device, bool *handled)
if (stat) if (stat)
nvkm_error(&mc->subdev, "intr %08x\n", stat); nvkm_error(&mc->subdev, "intr %08x\n", stat);
*handled = intr != 0; *handled = intr != 0;
if (mc->func->intr_hack)
mc->func->intr_hack(mc, handled);
} }
static u32 static u32
......
...@@ -26,7 +26,6 @@ struct nvkm_mc_func { ...@@ -26,7 +26,6 @@ struct nvkm_mc_func {
void (*intr_mask)(struct nvkm_mc *, u32 mask, u32 stat); void (*intr_mask)(struct nvkm_mc *, u32 mask, u32 stat);
/* retrieve pending interrupt mask (NV_PMC_INTR) */ /* retrieve pending interrupt mask (NV_PMC_INTR) */
u32 (*intr_stat)(struct nvkm_mc *); u32 (*intr_stat)(struct nvkm_mc *);
void (*intr_hack)(struct nvkm_mc *, bool *handled);
const struct nvkm_mc_map *reset; const struct nvkm_mc_map *reset;
void (*unk260)(struct nvkm_mc *, u32); void (*unk260)(struct nvkm_mc *, u32);
}; };
......
...@@ -100,21 +100,6 @@ tu102_mc_intr_stat(struct nvkm_mc *mc) ...@@ -100,21 +100,6 @@ tu102_mc_intr_stat(struct nvkm_mc *mc)
return intr0 | intr1; return intr0 | intr1;
} }
static void
tu102_mc_intr_hack(struct nvkm_mc *mc, bool *handled)
{
struct nvkm_device *device = mc->subdev.device;
u32 stat = nvkm_rd32(device, 0xb81010);
if (stat & 0x00000050) {
struct nvkm_subdev *subdev =
nvkm_device_subdev(device, NVKM_SUBDEV_FAULT);
nvkm_wr32(device, 0xb81010, stat & 0x00000050);
if (subdev)
nvkm_subdev_intr(subdev);
*handled = true;
}
}
static const struct nvkm_mc_func static const struct nvkm_mc_func
tu102_mc = { tu102_mc = {
...@@ -124,7 +109,6 @@ tu102_mc = { ...@@ -124,7 +109,6 @@ tu102_mc = {
.intr_rearm = tu102_mc_intr_rearm, .intr_rearm = tu102_mc_intr_rearm,
.intr_mask = tu102_mc_intr_mask, .intr_mask = tu102_mc_intr_mask,
.intr_stat = tu102_mc_intr_stat, .intr_stat = tu102_mc_intr_stat,
.intr_hack = tu102_mc_intr_hack,
.reset = gk104_mc_reset, .reset = gk104_mc_reset,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment