drm/i915: Convert 'flip_queued_seqno' into 'flip_queued_request'
Converted the flip_queued_seqno value to be a request structure as part of the
on going seqno to request changes. This includes reference counting the request
being saved away to ensure it can not be retired and freed while the flip code
is still waiting on it.
For: VIZ-4377
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Thomas Daniel <Thomas.Daniel@intel.com>
[danvet: Again get rid of the _irq request unref by simply moving that
into the unpin worker. Doesn't matter when we hang onto the request
for a bit longer, and in the unpin worker we already grab the
dev->struct_mutex anyway.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0eaa1f4..766cea7 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9128,6 +9128,11 @@
drm_gem_object_unreference(&work->old_fb_obj->base);
intel_update_fbc(dev);
+
+ if (work->flip_queued_req)
+ i915_gem_request_unreference(work->flip_queued_req);
+ work->flip_queued_req = NULL;
+ work->flip_queued_ring = NULL;
mutex_unlock(&dev->struct_mutex);
intel_frontbuffer_flip_complete(dev, INTEL_FRONTBUFFER_PRIMARY(pipe));
@@ -9736,10 +9741,14 @@
return false;
if (work->flip_ready_vblank == 0) {
- if (work->flip_queued_ring &&
- !i915_seqno_passed(work->flip_queued_ring->get_seqno(work->flip_queued_ring, true),
- work->flip_queued_seqno))
- return false;
+ if (work->flip_queued_ring) {
+ uint32_t s1 = work->flip_queued_ring->get_seqno(
+ work->flip_queued_ring, true);
+ uint32_t s2 = i915_gem_request_get_seqno(
+ work->flip_queued_req);
+ if (!i915_seqno_passed(s1, s2))
+ return false;
+ }
work->flip_ready_vblank = drm_vblank_count(dev, intel_crtc->pipe);
}
@@ -9903,8 +9912,8 @@
if (ret)
goto cleanup_unpin;
- work->flip_queued_seqno =
- i915_gem_request_get_seqno(obj->last_write_req);
+ i915_gem_request_assign(&work->flip_queued_req,
+ obj->last_write_req);
work->flip_queued_ring = obj->ring;
} else {
ret = dev_priv->display.queue_flip(dev, crtc, fb, obj, ring,
@@ -9912,8 +9921,8 @@
if (ret)
goto cleanup_unpin;
- work->flip_queued_seqno =
- i915_gem_request_get_seqno(intel_ring_get_request(ring));
+ i915_gem_request_assign(&work->flip_queued_req,
+ intel_ring_get_request(ring));
work->flip_queued_ring = ring;
}