Commit 1139ffb9 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau: call drm_vblank_cleanup() earlier

Fixes a NULL-ptr deref seen on module unload sometimes.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 2332b311
...@@ -74,14 +74,14 @@ nouveau_display_vblank_fini(struct drm_device *dev) ...@@ -74,14 +74,14 @@ nouveau_display_vblank_fini(struct drm_device *dev)
struct nouveau_display *disp = nouveau_display(dev); struct nouveau_display *disp = nouveau_display(dev);
int i; int i;
drm_vblank_cleanup(dev);
if (disp->vblank) { if (disp->vblank) {
for (i = 0; i < dev->mode_config.num_crtc; i++) for (i = 0; i < dev->mode_config.num_crtc; i++)
nouveau_event_ref(NULL, &disp->vblank[i]); nouveau_event_ref(NULL, &disp->vblank[i]);
kfree(disp->vblank); kfree(disp->vblank);
disp->vblank = NULL; disp->vblank = NULL;
} }
drm_vblank_cleanup(dev);
} }
static int static int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment