Module Name: src
Committed By: riastradh
Date: Wed Jul 24 04:05:00 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_drv.c
Log Message:
Call drm_vblank_cleanup in drm_detach.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/sys/external/bsd/drm2/drm/drm_drv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.21 src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.22
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.21 Wed Jul 24 04:01:37 2013
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Wed Jul 24 04:05:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.1.2.21 2013/07/24 04:01:37 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.1.2.22 2013/07/24 04:05:00 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.21 2013/07/24 04:01:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.22 2013/07/24 04:05:00 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -349,6 +349,12 @@ drm_detach(device_t self, int flags)
if (dev->driver->unload != NULL)
(*dev->driver->unload)(dev);
+ /*
+ * XXX Either this shouldn't be here, or the driver's load
+ * function shouldn't be responsible for drm_vblank_init.
+ */
+ drm_vblank_cleanup(dev);
+
drm_undo_fill_in_dev(dev);
return 0;
