Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/nouveau/nouveau_display.c

+2 −2
Original line number Diff line number Diff line
@@ -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