Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Destroy mutex if we init...



details:   https://anonhg.NetBSD.org/src/rev/e3a210717a1e
branches:  trunk
changeset: 365707:e3a210717a1e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:08:38 2018 +0000

description:
Destroy mutex if we init it.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r bc4a2dd7c85d -r e3a210717a1e sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c     Mon Aug 27 06:08:25 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c     Mon Aug 27 06:08:38 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_gem_stolen.c,v 1.6 2018/08/27 06:08:25 riastradh Exp $    */
+/*     $NetBSD: i915_gem_stolen.c,v 1.7 2018/08/27 06:08:38 riastradh Exp $    */
 
 /*
  * Copyright © 2008-2012 Intel Corporation
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_stolen.c,v 1.6 2018/08/27 06:08:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_stolen.c,v 1.7 2018/08/27 06:08:38 riastradh Exp $");
 
 #include <linux/printk.h>
 #include <linux/err.h>
@@ -292,6 +292,12 @@
        if (!drm_mm_initialized(&dev_priv->mm.stolen))
                return;
 
+#ifdef __NetBSD__
+       linux_mutex_destroy(&dev_priv->mm.stolen_lock);
+#else
+       mutex_destroy(&dev_priv->mm.stolen_lock);
+#endif
+
        drm_mm_takedown(&dev_priv->mm.stolen);
 }
 



Home | Main Index | Thread Index | Old Index