Module Name:    src
Committed By:   riastradh
Date:           Mon Aug 27 06:08:38 UTC 2018

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/i915: i915_gem_stolen.c

Log Message:
Destroy mutex if we init it.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
    src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.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_gem_stolen.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c:1.6	Mon Aug 27 06:08:25 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c	Mon Aug 27 06:08:38 2018
@@ -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 @@ void i915_gem_cleanup_stolen(struct drm_
 	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);
 }
 

Reply via email to