Module Name: src
Committed By: riastradh
Date: Mon Aug 27 13:43:39 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_dma.c i915_drv.h
intel_uncore.c
Log Message:
Fold local intel_uncore_destroy into upstream intel_uncore_fini.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c \
src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.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/dist/drm/i915/i915_dma.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.22 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.23
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.22 Mon Aug 27 07:18:18 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Mon Aug 27 13:43:39 2018
@@ -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_gtt:
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 @@ int i915_driver_unload(struct drm_device
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);
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.22 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.23
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.22 Mon Aug 27 07:57:12 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Mon Aug 27 13:43:39 2018
@@ -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_early_sanitize(
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,
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c:1.8 src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c:1.8 Mon Aug 27 07:29:20 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c Mon Aug 27 13:43:39 2018
@@ -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_init(struct drm_device
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);
