[src/netbsd-7]: src/sys/external/bsd/drm2/drm Pull up following revision(s) (...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/32406fe078b2
branches:  netbsd-7
changeset: 799792:32406fe078b2
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Feb 11 23:14:41 2016 +0000

description:
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@

diffstat:

 sys/external/bsd/drm2/drm/drm_drv.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 6b92254ce41e -r 32406fe078b2 sys/external/bsd/drm2/drm/drm_drv.c
--- a/sys/external/bsd/drm2/drm/drm_drv.c       Thu Feb 11 23:11:31 2016 +0000
+++ b/sys/external/bsd/drm2/drm/drm_drv.c       Thu Feb 11 23:14:41 2016 +0000
@@ -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_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);