Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:28:41 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_display.c intel_psr.c
Log Message:
Init and destroy dev_priv->psr.lock.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.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/intel_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.20 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.21
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.20 Mon Aug 27 07:21:16 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Mon Aug 27 07:28:41 2018
@@ -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 @@ void intel_modeset_cleanup(struct drm_de
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
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c:1.3 Mon Aug 27 07:28:04 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c Mon Aug 27 07:28:41 2018
@@ -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 @@ void intel_psr_init(struct drm_device *d
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
}
