[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Fold local intel_uncore_...

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

details:   https://anonhg.NetBSD.org/src/rev/9742c9b0c5e8
branches:  trunk
changeset: 835266:9742c9b0c5e8
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 13:43:39 2018 +0000

description:
Fold local intel_uncore_destroy into upstream intel_uncore_fini.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_dma.c     |   6 ++----
 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h     |   3 +--
 sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c |  15 +++++++--------
 3 files changed, 10 insertions(+), 14 deletions(-)

diffs (92 lines):

diff -r 9bb46798eea6 -r 9742c9b0c5e8 sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Mon Aug 27 13:43:22 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Mon Aug 27 13:43:39 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_dma.c,v 1.22 2018/08/27 07:18:18 riastradh Exp $  */
+/*     $NetBSD: i915_dma.c,v 1.23 2018/08/27 13:43:39 riastradh Exp $  */
 
 /* i915_dma.c -- DMA support for the I915 -*- linux-c -*-
  */
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_dma.c,v 1.22 2018/08/27 07:18:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_dma.c,v 1.23 2018/08/27 13:43:39 riastradh Exp $");
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
@@ -1183,7 +1183,6 @@
 out_freecsr:
        intel_csr_ucode_fini(dev);
        intel_uncore_fini(dev);
-       intel_uncore_destroy(dev);
        pci_iounmap(dev->pdev, dev_priv->regs);
 put_bridge:
        pci_dev_put(dev_priv->bridge_dev);
@@ -1294,7 +1293,6 @@
        i915_global_gtt_cleanup(dev);
 
        intel_uncore_fini(dev);
-       intel_uncore_destroy(dev);
        if (dev_priv->regs != NULL)
                pci_iounmap(dev->pdev, dev_priv->regs);
 
diff -r 9bb46798eea6 -r 9742c9b0c5e8 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Mon Aug 27 13:43:22 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Mon Aug 27 13:43:39 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.h,v 1.22 2018/08/27 07:57:12 riastradh Exp $  */
+/*     $NetBSD: i915_drv.h,v 1.23 2018/08/27 13:43:39 riastradh Exp $  */
 
 /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
  */
@@ -2798,7 +2798,6 @@
 extern void intel_uncore_init(struct drm_device *dev);
 extern void intel_uncore_check_errors(struct drm_device *dev);
 extern void intel_uncore_fini(struct drm_device *dev);
-extern void intel_uncore_destroy(struct drm_device *dev);
 extern void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore);
 const char *intel_uncore_forcewake_domain_to_str(const enum forcewake_domain_id id);
 void intel_uncore_forcewake_get(struct drm_i915_private *dev_priv,
diff -r 9bb46798eea6 -r 9742c9b0c5e8 sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c        Mon Aug 27 13:43:22 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c        Mon Aug 27 13:43:39 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_uncore.c,v 1.8 2018/08/27 07:29:20 riastradh Exp $       */
+/*     $NetBSD: intel_uncore.c,v 1.9 2018/08/27 13:43:39 riastradh Exp $       */
 
 /*
  * Copyright © 2013 Intel Corporation
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_uncore.c,v 1.8 2018/08/27 07:29:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_uncore.c,v 1.9 2018/08/27 13:43:39 riastradh Exp $");
 
 #include "i915_drv.h"
 #include "intel_drv.h"
@@ -1288,17 +1288,16 @@
 
 void intel_uncore_fini(struct drm_device *dev)
 {
+#ifdef __NetBSD__
+       struct drm_i915_private *const dev_priv = dev->dev_private;
+       unsigned i;
+#endif
+
        /* Paranoia: make sure we have disabled everything before we exit. */
        intel_uncore_sanitize(dev);
        intel_uncore_forcewake_reset(dev, false);
-}
 
-void intel_uncore_destroy(struct drm_device *dev)
-{
 #ifdef __NetBSD__
-       struct drm_i915_private *const dev_priv = dev->dev_private;
-       unsigned i;
-
        for (i = 0; i < FW_DOMAIN_ID_COUNT; i++) {
                if (dev_priv->uncore.fw_domains & (1u << i))
                        teardown_timer(&dev_priv->uncore.fw_domain[i].timer);