drm/i915: Do not call drm_crtc_arm_vblank_event in async flips
authorKarthik B S <karthik.b.s@intel.com>
Mon, 21 Sep 2020 11:02:06 +0000 (16:32 +0530)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 28 Sep 2020 11:12:49 +0000 (14:12 +0300)
Since the flip done event will be sent in the flip_done_handler,
no need to add the event to the list and delay it for later.

v2: -Moved the async check above vblank_get as it
     was causing issues for PSR.

v3: -No need to wait for vblank to pass, as this wait was causing a
     16ms delay once every few flips.

v4: -Rebased.

v5: -Rebased.

v6: -Rebased.

v7: -No need of irq disable if we are not doing vblank evade. (Ville)

v8: -Rebased.

v9: -Move the return in intel_pipe_update_end before tracepoint. (Ville)

v10: Rebased.

Signed-off-by: Karthik B S <karthik.b.s@intel.com>
Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200921110210.21182-5-karthik.b.s@intel.com
drivers/gpu/drm/i915/display/intel_sprite.c

index 63040cb0d4e10822b2ffb21ebc855408e9b4ff79..76a3d9bfe0dee27d336646debb4d80f37af2875d 100644 (file)
@@ -93,6 +93,9 @@ void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state)
        DEFINE_WAIT(wait);
        u32 psr_status;
 
+       if (new_crtc_state->uapi.async_flip)
+               return;
+
        vblank_start = adjusted_mode->crtc_vblank_start;
        if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE)
                vblank_start = DIV_ROUND_UP(vblank_start, 2);
@@ -200,6 +203,9 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state)
        ktime_t end_vbl_time = ktime_get();
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
 
+       if (new_crtc_state->uapi.async_flip)
+               return;
+
        trace_intel_pipe_update_end(crtc, end_vbl_count, scanline_end);
 
        /* We're still in the vblank-evade critical section, this can't race.