Module Name: src
Committed By: riastradh
Date: Mon Dec 30 04:51:35 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: i915_dma.c
i915_gem.c
Log Message:
Initialize and destroy the pending flip lock.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.31 -r1.1.1.1.2.32 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
cvs rdiff -u -r1.1.1.1.2.15 -r1.1.1.1.2.16 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.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.31 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.32
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.31 Sun Sep 8 16:28:27 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Mon Dec 30 04:51:35 2013
@@ -1750,6 +1750,7 @@ out_gem_unload:
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 @@ int i915_driver_unload(struct drm_device
#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
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.1.1.1.2.15 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.1.1.1.2.16
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.1.1.1.2.15 Sun Sep 8 16:28:27 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Mon Dec 30 04:51:35 2013
@@ -4633,6 +4633,7 @@ i915_gem_load(struct drm_device *dev)
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
