Module Name: src Committed By: jmcneill Date: Mon Nov 9 22:04:53 UTC 2015
Modified Files: src/sys/external/bsd/drm2/drm: drm_drv.c Log Message: 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.16 -r1.17 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.16 src/sys/external/bsd/drm2/drm/drm_drv.c:1.17 --- src/sys/external/bsd/drm2/drm/drm_drv.c:1.16 Sat Oct 17 16:19:38 2015 +++ src/sys/external/bsd/drm2/drm/drm_drv.c Mon Nov 9 22:04:53 2015 @@ -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_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);