From 2c4d430b0da3ee63e7338636f34311cec075ceea Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 11 Nov 2010 13:59:05 +1000 Subject: [PATCH] --- yaml --- r: 228573 b: refs/heads/master c: e4cbadcaaa4678020e37ca93502942ffdf9aef80 h: refs/heads/master i: 228571: 9fbf72bd132106e1b8dc42d6b71ea7bb8b94616a v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv04_display.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f873d7a85044..2ebcd46ed8e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 274fec93cdd627408a799519fa602f2eecb14d2f +refs/heads/master: e4cbadcaaa4678020e37ca93502942ffdf9aef80 diff --git a/trunk/drivers/gpu/drm/nouveau/nv04_display.c b/trunk/drivers/gpu/drm/nouveau/nv04_display.c index 0978a5b326dc..1715e1464b7d 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv04_display.c +++ b/trunk/drivers/gpu/drm/nouveau/nv04_display.c @@ -213,6 +213,9 @@ nv04_display_destroy(struct drm_device *dev) NV_DEBUG_KMS(dev, "\n"); + nouveau_irq_unregister(dev, 24); + nouveau_irq_unregister(dev, 25); + /* Turn every CRTC off. */ list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { struct drm_mode_set modeset = {