diff options
| author |   Ilia Mirkin <imirkin@alum.mit.edu> | 2014-01-29 19:53:00 -0500 |
|---|---|---|
| committer |   Ben Skeggs <bskeggs@redhat.com> | 2014-02-18 10:36:35 +1000 |
| commit | 7d3428cd4b2ad51af86fdbdf8284ca38fa95e601 (patch) | |
| tree | 3601749cab3d3cc9d8c0ad1bf78cbb84916783e9 /drivers/gpu/drm/nouveau/nouveau_drm.c | |
| parent | drm/nouveau: resume display if any later suspend bits fail (diff) | |
| download | linux-dev-7d3428cd4b2ad51af86fdbdf8284ca38fa95e601.tar.xz linux-dev-7d3428cd4b2ad51af86fdbdf8284ca38fa95e601.zip | |
drm/nouveau: set irq_enabled manually
Since commit 0fa9061ae8c ("drm/nouveau/mc: handle irq-related setup
ourselves"), drm_device->irq_enabled remained unset. This is needed in
order to properly wait for a vblank event in the generic drm code.
See https://bugs.freedesktop.org/show_bug.cgi?id=74195
Reported-by: Jan Janecek <janjanjanx@gmail.com>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: stable@vger.kernel.org # 3.10+
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 78c8e7146d56..89c484d8ac26 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -376,6 +376,8 @@ nouveau_drm_load(struct drm_device *dev, unsigned long flags) if (ret) goto fail_device; + dev->irq_enabled = true; + /* workaround an odd issue on nvc1 by disabling the device's * nosnoop capability. hopefully won't cause issues until a * better fix is found - assuming there is one... @@ -475,6 +477,7 @@ nouveau_drm_remove(struct pci_dev *pdev) struct nouveau_drm *drm = nouveau_drm(dev); struct nouveau_object *device; + dev->irq_enabled = false; device = drm->client.base.device; drm_put_dev(dev); |