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 More little err...



details:   https://anonhg.NetBSD.org/src/rev/ceb6b2c348be
branches:  riastradh-drm2
changeset: 788539:ceb6b2c348be
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Sep 08 16:01:22 2013 +0000

description:
More little error branch cleanup.

diffstat:

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

diffs (25 lines):

diff -r 75ef903828d6 -r ceb6b2c348be sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Sun Sep 08 16:00:50 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Sun Sep 08 16:01:22 2013 +0000
@@ -1757,6 +1757,8 @@
        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 @@
        }
 
 #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



Home | Main Index | Thread Index | Old Index