projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2332b31
)
drm/nouveau: call drm_vblank_cleanup() earlier
author
Ben Skeggs
<bskeggs@redhat.com>
Thu, 23 Jan 2014 00:49:47 +0000
(10:49 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Thu, 23 Jan 2014 03:39:19 +0000
(13:39 +1000)
Fixes a NULL-ptr deref seen on module unload sometimes.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_display.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_display.c
b/drivers/gpu/drm/nouveau/nouveau_display.c
index
a22d019
..
b4262ad
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_display.c
@@
-74,14
+74,14
@@
nouveau_display_vblank_fini(struct drm_device *dev)
struct nouveau_display *disp = nouveau_display(dev);
int i;
+ drm_vblank_cleanup(dev);
+
if (disp->vblank) {
for (i = 0; i < dev->mode_config.num_crtc; i++)
nouveau_event_ref(NULL, &disp->vblank[i]);
kfree(disp->vblank);
disp->vblank = NULL;
}
-
- drm_vblank_cleanup(dev);
}
static int