From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 2/5] drm/i915: Asynchronously unpin the old framebuffer after the next vblank
Date: Wed, 18 Apr 2012 17:57:41 +0100 [thread overview]
Message-ID: <1334768264-27785-3-git-send-email-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <1334768264-27785-1-git-send-email-chris@chris-wilson.co.uk>
Upon completion of a modeset, we must wait for the next vblank before
releasing the old framebufer. (The scanout registers are double-buffered
and update on the next vblank. If we unpin the old scanout too soon we
run the risk of accessing invalid memory, so we first need to wait until
the scanout is reading from the new framebuffer.)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_display.c | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f879633..03e5d86 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1950,6 +1950,26 @@ intel_finish_fb(struct drm_framebuffer *old_fb)
return ret;
}
+static void intel_crtc_unpin_work_fn(struct intel_crtc *crtc, void *obj)
+{
+ struct drm_device *dev = crtc->base.dev;
+
+ mutex_lock(&dev->struct_mutex);
+ intel_unpin_fb_obj(obj);
+ mutex_unlock(&dev->struct_mutex);
+}
+
+static void
+intel_crtc_queue_unpin(struct intel_crtc *crtc,
+ struct drm_i915_gem_object *obj)
+{
+ if (intel_crtc_add_vblank_task(crtc, false,
+ intel_crtc_unpin_work_fn, obj)) {
+ intel_wait_for_vblank(crtc->base.dev, crtc->pipe);
+ intel_unpin_fb_obj(obj);
+ }
+}
+
static int
intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
struct drm_framebuffer *old_fb)
@@ -2000,10 +2020,9 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
return ret;
}
- if (old_fb) {
- intel_wait_for_vblank(dev, intel_crtc->pipe);
- intel_unpin_fb_obj(to_intel_framebuffer(old_fb)->obj);
- }
+ if (old_fb)
+ intel_crtc_queue_unpin(intel_crtc,
+ to_intel_framebuffer(old_fb)->obj);
intel_update_fbc(dev);
mutex_unlock(&dev->struct_mutex);
--
1.7.10
next prev parent reply other threads:[~2012-04-18 16:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-18 16:57 [RFC] vblank worker for asynchronous unpinning and other tasks Chris Wilson
2012-04-18 16:57 ` [PATCH 1/5] drm/i915: Introduce vblank work function Chris Wilson
2012-04-18 16:57 ` Chris Wilson [this message]
2012-04-18 16:57 ` [PATCH 3/5] drm/i915/sprite: Make plane switching asynchronous Chris Wilson
2012-04-18 16:57 ` [PATCH 4/5] drm/i915: Synchronize userspace palette LUT (i.e. gamma) changes to vblank Chris Wilson
2012-04-18 16:57 ` [PATCH 5/5] drm/i915: Up/downclock LVDS on vblanks Chris Wilson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1334768264-27785-3-git-send-email-chris@chris-wilson.co.uk \
--to=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.