[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Init and destroy dev_pri...

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

details:   https://anonhg.NetBSD.org/src/rev/debc4be4b99a
branches:  trunk
changeset: 992680:debc4be4b99a
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:28:41 2018 +0000

description:
Init and destroy dev_priv->psr.lock.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_display.c |  6 ++++--
 sys/external/bsd/drm2/dist/drm/i915/intel_psr.c     |  8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (58 lines):

diff -r 721d0f0e163e -r debc4be4b99a sys/external/bsd/drm2/dist/drm/i915/intel_display.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Mon Aug 27 07:28:26 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Mon Aug 27 07:28:41 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_display.c,v 1.20 2018/08/27 07:21:16 riastradh Exp $     */
+/*     $NetBSD: intel_display.c,v 1.21 2018/08/27 07:28:41 riastradh Exp $     */
 
 /*
  * Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.20 2018/08/27 07:21:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.21 2018/08/27 07:28:41 riastradh Exp $");
 
 #include <linux/dmi.h>
 #include <linux/module.h>
@@ -15709,9 +15709,11 @@
        intel_teardown_gmbus(dev);
 
 #ifdef __NetBSD__
+       linux_mutex_destroy(&dev_priv->psr.lock);
        linux_mutex_destroy(&dev_priv->pps_mutex);
        linux_mutex_destroy(&dev_priv->fbc.lock);
 #else
+       mutex_destroy(&dev_priv->psr.lock);
        mutex_destroy(&dev_priv->pps_mutex);
        mutex_destroy(&dev_priv->fbc.lock);
 #endif
diff -r 721d0f0e163e -r debc4be4b99a sys/external/bsd/drm2/dist/drm/i915/intel_psr.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c   Mon Aug 27 07:28:26 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c   Mon Aug 27 07:28:41 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_psr.c,v 1.3 2018/08/27 07:28:04 riastradh Exp $  */
+/*     $NetBSD: intel_psr.c,v 1.4 2018/08/27 07:28:41 riastradh Exp $  */
 
 /*
  * Copyright © 2014 Intel Corporation
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_psr.c,v 1.3 2018/08/27 07:28:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_psr.c,v 1.4 2018/08/27 07:28:41 riastradh Exp $");
 
 #include <drm/drmP.h>
 
@@ -757,5 +757,9 @@
        struct drm_i915_private *dev_priv = dev->dev_private;
 
        INIT_DELAYED_WORK(&dev_priv->psr.work, intel_psr_work);
+#ifdef __NetBSD__
+       linux_mutex_init(&dev_priv->psr.lock);
+#else
        mutex_init(&dev_priv->psr.lock);
+#endif
 }