Module Name: src
Committed By: riastradh
Date: Sun Sep 8 16:01:22 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: i915_dma.c
Log Message:
More little error branch cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.26 -r1.1.1.1.2.27 \
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.26 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.27
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.26 Sun Sep 8 16:00:22 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Sun Sep 8 16:01:22 2013
@@ -1757,6 +1757,8 @@ out_gem_unload:
spin_lock_destroy(&dev_priv->rps.lock);
spin_lock_destroy(&dev_priv->dpio_lock);
linux_mutex_destroy(&dev_priv->rps.hw_lock);
+ DRM_DESTROY_WAITQUEUE(&dev_priv->pending_flip_queue);
+ destroy_completion(&dev_priv->error_completion);
#endif
if (dev->pdev->msi_enabled)
@@ -1891,6 +1893,12 @@ 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);
+ destroy_completion(&dev_priv->error_completion);
+#endif
+
+#ifdef __NetBSD__
if (dev_priv->regs_map != NULL)
(void)drm_rmmap(dev, dev_priv->regs_map);
#else
