[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm/i915 Initialize and ...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a7173984c372
branches:  riastradh-drm2
changeset: 788580:a7173984c372
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Dec 30 04:51:35 2013 +0000

description:
Initialize and destroy the pending flip lock.

diffstat:

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

diffs (30 lines):

diff -r 94c8aa706e4a -r a7173984c372 sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Mon Dec 30 04:51:24 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Mon Dec 30 04:51:35 2013 +0000
@@ -1750,6 +1750,7 @@
        spin_lock_destroy(&dev_priv->dpio_lock);
        linux_mutex_destroy(&dev_priv->rps.hw_lock);
        DRM_DESTROY_WAITQUEUE(&dev_priv->pending_flip_queue);
+       linux_mutex_destroy(&dev_priv->pending_flip_lock);
        destroy_completion(&dev_priv->error_completion);
 #endif
 
@@ -1884,6 +1885,7 @@
 #ifdef __NetBSD__
        /* XXX Not sure this is the right place, but it looks safe.  */
        DRM_DESTROY_WAITQUEUE(&dev_priv->pending_flip_queue);
+       linux_mutex_destroy(&dev_priv->pending_flip_lock);
        destroy_completion(&dev_priv->error_completion);
 #endif
 
diff -r 94c8aa706e4a -r a7173984c372 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Mon Dec 30 04:51:24 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Mon Dec 30 04:51:35 2013 +0000
@@ -4633,6 +4633,7 @@
        i915_gem_detect_bit_6_swizzle(dev);
 #ifdef __NetBSD__
        DRM_INIT_WAITQUEUE(&dev_priv->pending_flip_queue, "i915flip");
+       linux_mutex_init(&dev_priv->pending_flip_lock);
 #else
        init_waitqueue_head(&dev_priv->pending_flip_queue);
 #endif