Module Name: src
Committed By: riastradh
Date: Wed Jul 24 04:02:28 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: i915_dma.c
Log Message:
Don't redundantly cancel mm.retire_work or error_work.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.18 -r1.1.1.1.2.19 \
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.18 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.19
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.18 Wed Jul 24 04:00:51 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Wed Jul 24 04:02:28 2013
@@ -1873,11 +1873,9 @@ int i915_driver_unload(struct drm_device
* XXX Keep this updated! (XXX How?)
* (XXX Well, do work queues for real...)
*/
- cancel_delayed_work_sync(&dev_priv->mm.retire_work);
cancel_work_sync(&dev_priv->l3_parity.error_work);
cancel_work_sync(&dev_priv->rps.work);
cancel_work_sync(&dev_priv->hotplug_work);
- cancel_work_sync(&dev_priv->error_work);
# if 0 /* XXX How do we get the CRTCs? */
cancel_work_sync(&...intel_crtc->unpin_work);
# endif
