On Wed, Jun 17, 2020 at 11:58:10AM +0200, Daniel Vetter wrote:
On Wed, Jun 10, 2020 at 03:33:06PM -0700, Paulo Zanoni wrote:
Em qui, 2020-05-28 às 11:09 +0530, Karthik B S escreveu:
Add enable/disable flip done functions and the flip done handler function which handles the flip done interrupt.
Enable the flip done interrupt in IER.
Enable flip done function is called before writing the surface address register as the write to this register triggers the flip done interrupt
Flip done handler is used to send the page flip event as soon as the surface address is written as per the requirement of async flips. The interrupt is disabled after the event is sent.
v2: -Change function name from icl_* to skl_* (Paulo) -Move flip handler to this patch (Paulo) -Remove vblank_put() (Paulo) -Enable flip done interrupt for gen9+ only (Paulo) -Enable flip done interrupt in power_well_post_enable hook (Paulo) -Removed the event check in flip done handler to handle async flips without pageflip events.
v3: -Move skl_disable_flip_done out of interrupt handler (Paulo) -Make the pending vblank event NULL in the begining of flip_done_handler to remove sporadic WARN_ON that is seen.
Signed-off-by: Karthik B S karthik.b.s@intel.com
drivers/gpu/drm/i915/display/intel_display.c | 10 ++++ drivers/gpu/drm/i915/i915_irq.c | 52 ++++++++++++++++++++ drivers/gpu/drm/i915/i915_irq.h | 2 + 3 files changed, 64 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index f40b909952cc..48cc1fc9bc5a 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -15530,6 +15530,13 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
intel_dbuf_pre_plane_update(state);
- for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) {
if (new_crtc_state->uapi.async_flip) {skl_enable_flip_done(&crtc->base);break;}- }
- /* Now enable the clocks, plane, pipe, and connectors that we set up. */ dev_priv->display.commit_modeset_enables(state);
@@ -15551,6 +15558,9 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) drm_atomic_helper_wait_for_flip_done(dev, &state->base);
for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) {
if (new_crtc_state->uapi.async_flip)skl_disable_flip_done(&crtc->base);if (new_crtc_state->hw.active && !needs_modeset(new_crtc_state) && !new_crtc_state->preload_luts &&diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index efdd4c7b8e92..632e7b1deb87 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1295,6 +1295,23 @@ display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv, u32 crc4) {} #endif
+static void flip_done_handler(struct drm_i915_private *dev_priv,
unsigned int pipe)+{
- struct intel_crtc *crtc = intel_get_crtc_for_pipe(dev_priv, pipe);
- struct drm_crtc_state *crtc_state = crtc->base.state;
- struct drm_pending_vblank_event *e = crtc_state->event;
- struct drm_device *dev = &dev_priv->drm;
- unsigned long irqflags;
- crtc_state->event = NULL;
- spin_lock_irqsave(&dev->event_lock, irqflags);
- drm_crtc_send_vblank_event(&crtc->base, e);
I don't think this is what we want. With this, the events the Kernel sends us all have the same sequence and timestamp. In fact, the IGT test you submitted fails because of this.
In my original hackish proof-of-concept patch I had changed drm_update_vblank_count() to force diff=1 in order to always send events and I also changed g4x_get_vblank_counter() to get the counter from FLIPCOUNT (which updates every time there's a flip) instead of FRMCOUNT (which doesn't seem to increment when you do async flips). That is a drastic change, but the patch was just a PoC so I didn't care about keeping anything else working.
One thing that confused me a little bit when dealing the the vblank/flip event interface from drm.ko is that "flips" and "vblanks" seem to be changed interchangeably, which is confusing for async flips: if you keep forever doing async flips in the very first few scanlines you never actually reach the "vblank" period, yet you keep flipping your frame. Then, what should your expectation regarding events be?
Hm vblank should keep happening I thought (this isn't VRR or DRRS or PSR where that changes), no idea why we can't keep sending out vblank interrupts.
Now flip events look maybe conflated in drm.ko code with vblank events since most of the time a flip complete happens at exactly the same time the vblank event. But for async flip this is not the case.
Probably worth it to have new helpers/function in drm_vblank.c for async flips, so that this is less confusing. Plus good documentation.
We're going to need three different ways to calculate the flip timestamps: sync flip, vrr sync flip, async flip.
First one we handle just fine currently since we know know when the timestamp was sampled and when the vblank ends so we can do the appropriate correction.
VRR is going to be a bit more interesting since we don't really know how long the vblank will be. I think we may have to use the frame timestamp and current timestamp counter to first convert the monotonic timestamp to correlate with the start of the vblank exit, and then we can move it forward by the fixed (I think) length of the vblank exit procedure.
For async flip I think we may want to do something similar with the flip done timestamp and current timestamp (apart from adding the fixed length of the vblank exit procedure of course, since there is no vblank exit). Although I'm not entirely sure what we should do if we do the async flip during the vblank. If we want to maintain that the timestamp always correlates with the first pixel actually getting scanned out then we should still correct the timestamp to point past the end of vblank. And even with the corrections there will be some amount of error due to the old data first having to drain out of the FIFO. That error I think we're just going to have to accept.
Not sure how much surgery all that is going to require to the vblank timestamping code.