On Tue, Apr 07, 2015 at 04:20:27PM +0100, Chris Wilson wrote: > Synchronising to an object active on the same ring is a no-op, for the > benefit of execbuffer scheduler. However, for CS flips this means that > we can forgo checking whether the last write request of the object is > actually queued and more importantly whether the cache flush for the > write was emitted. > > Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> Does this go boom in reality, i.e. bugzilla/igt? If so I guess this should be for 4.1+cc:stable? Otherwise I think I'll punt since olr is on its demise anyway. -Daniel > --- > drivers/gpu/drm/i915/intel_display.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 4af89c27504e..0415e40cef6e 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -10347,6 +10347,12 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, > i915_gem_request_assign(&work->flip_queued_req, > obj->last_write_req); > } else { > + if (obj->last_write_req) { > + ret = i915_gem_check_olr(obj->last_write_req); > + if (ret) > + goto cleanup_unpin; > + } > + > ret = dev_priv->display.queue_flip(dev, crtc, fb, obj, ring, > page_flip_flags); > if (ret) > -- > 2.1.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx