From 826e3e335ff7c6f2d867c80b91bf9b34f2c4dbf4 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 15 Nov 2012 10:16:11 +0000 Subject: [PATCH] drm/i915: Isolate the unpin worker to our private workqueue intel_unpin_work_fn() acquires the struct_mutex and so behaves very much like every other drm_i915_private task and is suitable for our private ordered workqueue. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 6d8a5ed..63e0b3e 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6956,7 +6956,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev, &obj->pending_flip.counter); wake_up(&dev_priv->pending_flip_queue); - schedule_work(&work->work); + queue_work(dev_priv->wq, &work->work); trace_i915_flip_complete(intel_crtc->plane, work->pending_flip_obj); } -- 1.7.10.4