drm/i915: fix current fb blocking for flipping.
Subsystems (2)
PATCH 1/1 drm/i915: fix current fb blocking for flipping.
Block execbuffer for the fb to be flipped away, not the one that is to be flipped in.
Signed-off-by Chia-I Wu <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +3 -2
@@ -4664,7 +4664,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,spin_unlock_irqrestore (&dev->event_lock, flags); - obj_priv =to_intel_bo (work->pending_flip_obj); + obj_priv =to_intel_bo (work->old_fb_obj);/* Initial scanout buffer will have a 0 pending flip count */ if ((atomic_read(&obj_priv->pending_flip) == 0) ||
@@ -4729,6 +4729,8 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, work->dev = crtc->dev; intel_fb =to_intel_framebuffer (crtc->fb); work->old_fb_obj = intel_fb->obj; + obj_priv =to_intel_bo (intel_fb->obj); +atomic_inc (&obj_priv->pending_flip);INIT_WORK (&work->work, intel_unpin_work_fn);/* We borrow the event spin lock for protecting unpin_work */
@@ -4770,7 +4772,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,i915_gem_object_flush_write_domain (obj);drm_vblank_get (dev, intel_crtc->pipe); obj_priv =to_intel_bo (obj); -atomic_inc (&obj_priv->pending_flip); work->pending_flip_obj = obj;if (intel_crtc->plane)
Signature · 1 line
1.7.1
Quoted 3 lines · On Thu, 21 Oct 2010 17:32:30 +0800 Chia-I Wu <[email protected]> wrote:
Block execbuffer for the fb to be flipped away, not the one that is to be flipped in.
I think we want to block rendering on both? Otherwise we could display partial drawing in the new buffer.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Quoted 7 lines · Jesse Barnes
Quoted 2 lines · On Thu, 21 Oct 2010 17:32:30 +0800 Chia-I Wu <[email protected]> wrote:
Block execbuffer for the fb to be flipped away, not the one that is to be flipped in.
I think we want to block rendering on both? Otherwise we could display partial drawing in the new buffer.
I sent the wrong patch accidentally. Please ignore this one.
Signature · 1 line
[email protected]