Module Name: src
Committed By: riastradh
Date: Mon Dec 30 04:52:02 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: i915_dma.c
Log Message:
flush_workqueue should work now, so don't work around it i915 unload.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.33 -r1.1.1.1.2.34 \
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.33 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.34
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.33 Mon Dec 30 04:51:53 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Mon Dec 30 04:52:02 2013
@@ -1853,18 +1853,7 @@ int i915_driver_unload(struct drm_device
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
/* Flush any outstanding unpin_work. */
-#ifdef __NetBSD__
- /*
- * XXX Keep this updated! (XXX How?)
- * (XXX Well, do work queues for real...)
- */
- cancel_work_sync(&dev_priv->l3_parity.error_work);
-# if 0 /* XXX How do we get the CRTCs? */
- cancel_work_sync(&...intel_crtc->unpin_work);
-# endif
-#else
flush_workqueue(dev_priv->wq);
-#endif
mutex_lock(&dev->struct_mutex);
i915_gem_free_all_phys_object(dev);
