diff options
author | Karol Herbst <kherbst@redhat.com> | 2017-11-23 21:56:26 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2017-12-18 19:16:37 -0500 |
commit | a121027d2747168df0aac0c3da35509eea39f61c (patch) | |
tree | a97382251dadb6143f45589f804f9ced39d7cfca | |
parent | 81a24b9ae8eea95b74337c253059da761043ed06 (diff) |
drm/nouveau/pci: do a msi rearm on init
On my GP107 when I load nouveau after unloading it, for some reason the
GPU stopped sending or the CPU stopped receiving interrupts if MSI was
enabled.
Doing a rearm once before getting any interrupts fixes this.
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c index b1b1f3626b96..deb96de54b00 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c | |||
@@ -136,6 +136,13 @@ nvkm_pci_init(struct nvkm_subdev *subdev) | |||
136 | return ret; | 136 | return ret; |
137 | 137 | ||
138 | pci->irq = pdev->irq; | 138 | pci->irq = pdev->irq; |
139 | |||
140 | /* Ensure MSI interrupts are armed, for the case where there are | ||
141 | * already interrupts pending (for whatever reason) at load time. | ||
142 | */ | ||
143 | if (pci->msi) | ||
144 | pci->func->msi_rearm(pci); | ||
145 | |||
139 | return ret; | 146 | return ret; |
140 | } | 147 | } |
141 | 148 | ||