diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2022-06-01 12:46:54 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2022-11-09 01:44:36 +0100 |
| commit | b59d810a47423e61ae4e0ded502585e6ee9b1d76 (patch) | |
| tree | 197669315796a084ad6d0c9b75244a8f449682b8 /drivers/gpu/drm/nouveau/nvkm/subdev/mc | |
| parent | drm/nouveau/vfn/tu102-: support new-style interrupt tree (diff) | |
| download | linux-b59d810a47423e61ae4e0ded502585e6ee9b1d76.tar.xz linux-b59d810a47423e61ae4e0ded502585e6ee9b1d76.zip | |
drm/nouveau/fault/tu102: switch to explicit intr handlers
- reads vectors from HW, rather than being hardcoded
- removes hacks to support routing via old interfaces
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/mc')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu102.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu102.c index a96084b34a78..630a9c9e7ac9 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu102.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu102.c @@ -39,11 +39,6 @@ tu102_mc_intr_update(struct tu102_mc *mc) nvkm_wr32(device, 0x000180 + (i * 0x04), ~mask); nvkm_wr32(device, 0x000160 + (i * 0x04), mask); } - - if (mask & 0x00000200) - nvkm_wr32(device, 0xb81608, 0x6); - else - nvkm_wr32(device, 0xb81610, 0x6); } static void @@ -88,14 +83,6 @@ tu102_mc_intr_stat(struct nvkm_mc *mc) struct nvkm_device *device = mc->subdev.device; u32 intr0 = nvkm_rd32(device, 0x000100); u32 intr1 = nvkm_rd32(device, 0x000104); - u32 intr_top = nvkm_rd32(device, 0xb81600); - - /* Turing and above route the MMU fault interrupts via a different - * interrupt tree with different control registers. For the moment remap - * them back to the old PMC vector. - */ - if (intr_top & 0x00000006) - intr0 |= 0x00000200; return intr0 | intr1; } |