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

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

details:   https://anonhg.NetBSD.org/src/rev/486b0eebe49f
branches:  riastradh-drm2
changeset: 788583:486b0eebe49f
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Dec 30 04:52:02 2013 +0000

description:
flush_workqueue should work now, so don't work around it i915 unload.

diffstat:

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

diffs (22 lines):

diff -r 1c8d6d4384d9 -r 486b0eebe49f 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:53 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Mon Dec 30 04:52:02 2013 +0000
@@ -1853,18 +1853,7 @@
 
        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);