Source-Changes-HG archive

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

[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm/i915 Convert i915_dr...



details:   https://anonhg.NetBSD.org/src/rev/cf7622959f6a
branches:  riastradh-drm2
changeset: 788295:cf7622959f6a
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:07:05 2013 +0000

description:
Convert i915_driver_load to linux_mutex_init, and destory in unload.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_dma.c |  12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diffs (30 lines):

diff -r 8c54e0f878e7 -r cf7622959f6a sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Wed Jul 24 03:06:48 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Wed Jul 24 03:07:05 2013 +0000
@@ -1691,7 +1691,11 @@
        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 @@
        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);
 



Home | Main Index | Thread Index | Old Index