Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/drm only clear agp hook on last close ...



details:   https://anonhg.NetBSD.org/src/rev/461c20e0d692
branches:  trunk
changeset: 341519:461c20e0d692
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Nov 09 22:04:53 2015 +0000

description:
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 270cc1da1fc3 -r 461c20e0d692 sys/external/bsd/drm2/drm/drm_drv.c
--- a/sys/external/bsd/drm2/drm/drm_drv.c       Mon Nov 09 20:26:15 2015 +0000
+++ b/sys/external/bsd/drm2/drm/drm_drv.c       Mon Nov 09 22:04:53 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_drv.c,v 1.16 2015/10/17 16:19:38 jmcneill Exp $    */
+/*     $NetBSD: drm_drv.c,v 1.17 2015/11/09 22:04:53 jmcneill 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.16 2015/10/17 16:19:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.17 2015/11/09 22:04:53 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -394,7 +394,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);



Home | Main Index | Thread Index | Old Index