[src/trunk]: src/sys/external/bsd/drm2/pci drm: Simplify -- remove drm_pci_ag...

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

details:   https://anonhg.NetBSD.org/src/rev/3317c61a60cd
branches:  trunk
changeset: 1028741:3317c61a60cd
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:54:32 2021 +0000

description:
drm: Simplify -- remove drm_pci_agp_destroy.

diffstat:

 sys/external/bsd/drm2/pci/drm_pci.c |  21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)

diffs (49 lines):

diff -r 808d44c07d1f -r 3317c61a60cd sys/external/bsd/drm2/pci/drm_pci.c
--- a/sys/external/bsd/drm2/pci/drm_pci.c       Sun Dec 19 11:54:24 2021 +0000
+++ b/sys/external/bsd/drm2/pci/drm_pci.c       Sun Dec 19 11:54:32 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_pci.c,v 1.46 2021/12/19 11:53:51 riastradh Exp $   */
+/*     $NetBSD: drm_pci.c,v 1.47 2021/12/19 11:54:32 riastradh Exp $   */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.46 2021/12/19 11:53:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.47 2021/12/19 11:54:32 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/errno.h>
@@ -140,7 +140,11 @@
 {
 
        /* Tear down AGP stuff if necessary.  */
-       drm_pci_agp_destroy(dev);
+       if (dev->agp) {
+               arch_phys_wc_del(dev->agp->agp_mtrr);
+               drm_agp_fini(dev);
+               KASSERT(dev->agp == NULL);
+       }
 
        /* Free the record of available bus space mappings.  */
        dev->bus_nmaps = 0;
@@ -152,17 +156,6 @@
        }
 }
 
-void
-drm_pci_agp_destroy(struct drm_device *dev)
-{
-
-       if (dev->agp) {
-               arch_phys_wc_del(dev->agp->agp_mtrr);
-               drm_agp_fini(dev);
-               KASSERT(dev->agp == NULL);
-       }
-}
-
 int
 drm_pci_request_irq(struct drm_device *dev, int flags)
 {