Module Name: src
Committed By: snj
Date: Thu Feb 11 23:14:41 UTC 2016
Modified Files:
src/sys/external/bsd/drm2/drm [netbsd-7]: drm_drv.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1087):
sys/external/bsd/drm2/drm/drm_drv.c: revision 1.17
only clear agp hook on last close when agp is in use, from riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.9.2.4 -r1.9.2.5 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.9.2.4 src/sys/external/bsd/drm2/drm/drm_drv.c:1.9.2.5
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.9.2.4 Tue Mar 17 17:52:49 2015
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Thu Feb 11 23:14:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.9.2.4 2015/03/17 17:52:49 riz Exp $ */
+/* $NetBSD: drm_drv.c,v 1.9.2.5 2016/02/11 23:14:41 snj 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.9.2.4 2015/03/17 17:52:49 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.9.2.5 2016/02/11 23:14:41 snj Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -392,7 +392,8 @@ drm_lastclose(struct drm_device *dev)
drm_irq_uninstall(dev);
mutex_lock(&dev->struct_mutex);
- drm_agp_clear_hook(dev);
+ if (dev->agp)
+ drm_agp_clear_hook(dev);
drm_legacy_sg_cleanup(dev);
list_for_each_entry_safe(vma, vma_temp, &dev->vmalist, head) {
list_del(&vma->head);
