Patchwork drm/i915: Flush outstanding unpin tasks before pageflipping

login
register
mail settings
Submitter Daniel Gnoutcheff
Date Dec. 28, 2012, 2:30 a.m.
Message ID <1356661847-4840-1-git-send-email-daniel@gnoutcheff.name>
Download mbox | patch
Permalink /patch/209023/
State New
Headers show

Comments

Daniel Gnoutcheff - Dec. 28, 2012, 2:30 a.m.
From: Chris Wilson <chris@chris-wilson.co.uk>

commit b4a98e57fc27854b5938fc8b08b68e5e68b91e1f upstream

If we accumulate unpin tasks because we are pageflipping faster than the
system can schedule its workers, we can effectively create a
pin-leak. The solution taken here is to limit the number of unpin tasks
we have per-crtc and to flush those outstanding tasks if we accumulate
too many. This should prevent any jitter in the normal case, and also
prevent the hang if we should run too fast.

Note: It is important that we switch from the system workqueue to our
own dev_priv->wq since all work items on that queue are guaranteed to
only need the dev->struct_mutex and not any modeset resources. For
otherwise if we have a work item ahead in the queue which needs the
modeset lock (like the output detect work used by both polling or
hpd), this work and so the unpin work will never execute since the
pageflip code already holds that lock. Unfortunately there's no
lockdep support for this scenario in the workqueue code.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=46991
Reported-and-tested-by: Tvrtko Ursulin <tvrtko.ursulin@onelan.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
[danvet: Added note about workqueu deadlock.]
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56337
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58732
Tested-by: Daniel Gnoutcheff <daniel@gnoutcheff.name>
[dg: Adjusted context, removed a whitespace change]
Launchpad: https://bugs.launchpad.net/linux/+bug/1094173
---

This patch is intended for the 3.5.7.y extended longterm queue.  It has
had its context adjusted so it will apply cleanly on 3.5.7.2.  The same
patch (with different context) has been submitted upstream for the 3.7.y
queue.

Thanks, HTH!

 drivers/gpu/drm/i915/intel_display.c |   21 ++++++++++++++++-----
 drivers/gpu/drm/i915/intel_drv.h     |    4 +++-
 2 files changed, 19 insertions(+), 6 deletions(-)
Herton Ronaldo Krzesinski - Jan. 10, 2013, 2:41 a.m.
On Thu, Dec 27, 2012 at 09:30:47PM -0500, Daniel Gnoutcheff wrote:
> From: Chris Wilson <chris@chris-wilson.co.uk>
> 
> commit b4a98e57fc27854b5938fc8b08b68e5e68b91e1f upstream
> 
> If we accumulate unpin tasks because we are pageflipping faster than the
> system can schedule its workers, we can effectively create a
> pin-leak. The solution taken here is to limit the number of unpin tasks
> we have per-crtc and to flush those outstanding tasks if we accumulate
> too many. This should prevent any jitter in the normal case, and also
> prevent the hang if we should run too fast.
> 
> Note: It is important that we switch from the system workqueue to our
> own dev_priv->wq since all work items on that queue are guaranteed to
> only need the dev->struct_mutex and not any modeset resources. For
> otherwise if we have a work item ahead in the queue which needs the
> modeset lock (like the output detect work used by both polling or
> hpd), this work and so the unpin work will never execute since the
> pageflip code already holds that lock. Unfortunately there's no
> lockdep support for this scenario in the workqueue code.
> 
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=46991
> Reported-and-tested-by: Tvrtko Ursulin <tvrtko.ursulin@onelan.co.uk>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> [danvet: Added note about workqueu deadlock.]
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56337
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58732
> Tested-by: Daniel Gnoutcheff <daniel@gnoutcheff.name>
> [dg: Adjusted context, removed a whitespace change]
> Launchpad: https://bugs.launchpad.net/linux/+bug/1094173
> ---
> 
> This patch is intended for the 3.5.7.y extended longterm queue.  It has
> had its context adjusted so it will apply cleanly on 3.5.7.2.  The same
> patch (with different context) has been submitted upstream for the 3.7.y
> queue.
> 
> Thanks, HTH!
> 
>  drivers/gpu/drm/i915/intel_display.c |   21 ++++++++++++++++-----
>  drivers/gpu/drm/i915/intel_drv.h     |    4 +++-
>  2 files changed, 19 insertions(+), 6 deletions(-)

queued for 3.5, thanks.

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 552a229..27edd55 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5872,14 +5872,19 @@  static void intel_unpin_work_fn(struct work_struct *__work)
 {
 	struct intel_unpin_work *work =
 		container_of(__work, struct intel_unpin_work, work);
+	struct drm_device *dev = work->crtc->dev;
 
-	mutex_lock(&work->dev->struct_mutex);
+	mutex_lock(&dev->struct_mutex);
 	intel_unpin_fb_obj(work->old_fb_obj);
 	drm_gem_object_unreference(&work->pending_flip_obj->base);
 	drm_gem_object_unreference(&work->old_fb_obj->base);
 
-	intel_update_fbc(work->dev);
-	mutex_unlock(&work->dev->struct_mutex);
+	intel_update_fbc(dev);
+	mutex_unlock(&dev->struct_mutex);
+
+	BUG_ON(atomic_read(&to_intel_crtc(work->crtc)->unpin_work_count) == 0);
+	atomic_dec(&to_intel_crtc(work->crtc)->unpin_work_count);
+
 	kfree(work);
 }
 
@@ -5950,7 +5955,8 @@  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);
 }
@@ -6244,7 +6250,7 @@  static int intel_crtc_page_flip(struct drm_crtc *crtc,
 		return -ENOMEM;
 
 	work->event = event;
-	work->dev = crtc->dev;
+	work->crtc = crtc;
 	intel_fb = to_intel_framebuffer(crtc->fb);
 	work->old_fb_obj = intel_fb->obj;
 	INIT_WORK(&work->work, intel_unpin_work_fn);
@@ -6269,6 +6275,9 @@  static int intel_crtc_page_flip(struct drm_crtc *crtc,
 	intel_fb = to_intel_framebuffer(fb);
 	obj = intel_fb->obj;
 
+	if (atomic_read(&intel_crtc->unpin_work_count) >= 2)
+		flush_workqueue(dev_priv->wq);
+
 	mutex_lock(&dev->struct_mutex);
 
 	/* Reference the objects for the scheduled work. */
@@ -6285,6 +6294,7 @@  static int intel_crtc_page_flip(struct drm_crtc *crtc,
 	 * the flip occurs and the object is no longer visible.
 	 */
 	atomic_add(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
+	atomic_inc(&intel_crtc->unpin_work_count);
 
 	ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
 	if (ret)
@@ -6299,6 +6309,7 @@  static int intel_crtc_page_flip(struct drm_crtc *crtc,
 	return 0;
 
 cleanup_pending:
+	atomic_dec(&intel_crtc->unpin_work_count);
 	atomic_sub(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
 	drm_gem_object_unreference(&work->old_fb_obj->base);
 	drm_gem_object_unreference(&obj->base);
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 9040191..39c7ea8 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -176,6 +176,8 @@  struct intel_crtc {
 	struct intel_unpin_work *unpin_work;
 	int fdi_lanes;
 
+	atomic_t unpin_work_count;
+
 	struct drm_i915_gem_object *cursor_bo;
 	uint32_t cursor_addr;
 	int16_t cursor_x, cursor_y;
@@ -319,7 +321,7 @@  intel_get_crtc_for_plane(struct drm_device *dev, int plane)
 
 struct intel_unpin_work {
 	struct work_struct work;
-	struct drm_device *dev;
+	struct drm_crtc *crtc;
 	struct drm_i915_gem_object *old_fb_obj;
 	struct drm_i915_gem_object *pending_flip_obj;
 	struct drm_pending_vblank_event *event;