Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:07:05 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: i915_dma.c
Log Message:
Convert i915_driver_load to linux_mutex_init, and destory in unload.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.11 -r1.1.1.1.2.12 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.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.1.1.1.2.11 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.12
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.11 Wed Jul 24 03:06:48 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Wed Jul 24 03:07:05 2013
@@ -1691,7 +1691,11 @@ int i915_driver_load(struct drm_device *
spin_lock_init(&dev_priv->rps.lock);
spin_lock_init(&dev_priv->dpio_lock);
+#ifdef __NetBSD__
+ linux_mutex_init(&dev_priv->rps.hw_lock);
+#else
mutex_init(&dev_priv->rps.hw_lock);
+#endif
if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))
dev_priv->num_pipe = 3;
@@ -1733,6 +1737,14 @@ out_gem_unload:
if (dev_priv->mm.inactive_shrinker.shrink)
unregister_shrinker(&dev_priv->mm.inactive_shrinker);
+#ifdef __NetBSD__
+ spin_lock_destroy(&dev_priv->irq_lock);
+ spin_lock_destroy(&dev_priv->error_lock);
+ spin_lock_destroy(&dev_priv->rps.lock);
+ spin_lock_destroy(&dev_priv->dpio_lock);
+ linux_mutex_destroy(&dev_priv->rps.hw_lock);
+#endif
+
if (dev->pdev->msi_enabled)
pci_disable_msi(dev->pdev);
