From: Karthik B S <karthik.b.s@intel.com> To: intel-gfx@lists.freedesktop.org Cc: paulo.r.zanoni@intel.com, Karthik B S <karthik.b.s@intel.com>, dri-devel@lists.freedesktop.org, vandita.kulkarni@intel.com, uma.shankar@intel.com, daniel.vetter@intel.com, nicholas.kazlauskas@amd.com Subject: [PATCH v4 4/5] drm/i915: Do not call drm_crtc_arm_vblank_event in async flips Date: Tue, 14 Jul 2020 06:57:24 +0530 [thread overview] Message-ID: <20200714012725.18383-5-karthik.b.s@intel.com> (raw) In-Reply-To: <20200714012725.18383-1-karthik.b.s@intel.com> 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. Signed-off-by: Karthik B S <karthik.b.s@intel.com> Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com> --- drivers/gpu/drm/i915/display/intel_sprite.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c index 7cffdb48e6df..2f1bc8bde516 100644 --- a/drivers/gpu/drm/i915/display/intel_sprite.c +++ b/drivers/gpu/drm/i915/display/intel_sprite.c @@ -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) + goto irq_disable; + vblank_start = adjusted_mode->crtc_vblank_start; if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) vblank_start = DIV_ROUND_UP(vblank_start, 2); @@ -206,7 +209,7 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state) * Would be slightly nice to just grab the vblank count and arm the * event outside of the critical section - the spinlock might spin for a * while ... */ - if (new_crtc_state->uapi.event) { + if (new_crtc_state->uapi.event && !new_crtc_state->uapi.async_flip) { drm_WARN_ON(&dev_priv->drm, drm_crtc_vblank_get(&crtc->base) != 0); @@ -220,6 +223,9 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state) local_irq_enable(); + if (new_crtc_state->uapi.async_flip) + return; + if (intel_vgpu_active(dev_priv)) return; -- 2.22.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Karthik B S <karthik.b.s@intel.com> To: intel-gfx@lists.freedesktop.org Cc: paulo.r.zanoni@intel.com, dri-devel@lists.freedesktop.org, daniel.vetter@intel.com, harry.wentland@amd.com, nicholas.kazlauskas@amd.com Subject: [Intel-gfx] [PATCH v4 4/5] drm/i915: Do not call drm_crtc_arm_vblank_event in async flips Date: Tue, 14 Jul 2020 06:57:24 +0530 [thread overview] Message-ID: <20200714012725.18383-5-karthik.b.s@intel.com> (raw) In-Reply-To: <20200714012725.18383-1-karthik.b.s@intel.com> 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. Signed-off-by: Karthik B S <karthik.b.s@intel.com> Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com> --- drivers/gpu/drm/i915/display/intel_sprite.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c index 7cffdb48e6df..2f1bc8bde516 100644 --- a/drivers/gpu/drm/i915/display/intel_sprite.c +++ b/drivers/gpu/drm/i915/display/intel_sprite.c @@ -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) + goto irq_disable; + vblank_start = adjusted_mode->crtc_vblank_start; if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) vblank_start = DIV_ROUND_UP(vblank_start, 2); @@ -206,7 +209,7 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state) * Would be slightly nice to just grab the vblank count and arm the * event outside of the critical section - the spinlock might spin for a * while ... */ - if (new_crtc_state->uapi.event) { + if (new_crtc_state->uapi.event && !new_crtc_state->uapi.async_flip) { drm_WARN_ON(&dev_priv->drm, drm_crtc_vblank_get(&crtc->base) != 0); @@ -220,6 +223,9 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state) local_irq_enable(); + if (new_crtc_state->uapi.async_flip) + return; + if (intel_vgpu_active(dev_priv)) return; -- 2.22.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-07-14 1:51 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-14 1:27 [PATCH v4 0/5] Asynchronous flip implementation for i915 Karthik B S 2020-07-14 1:27 ` [Intel-gfx] " Karthik B S 2020-07-14 1:27 ` [PATCH v4 1/5] drm/i915: Add enable/disable flip done and flip done handler Karthik B S 2020-07-14 1:27 ` [Intel-gfx] " Karthik B S 2020-07-14 3:40 ` kernel test robot 2020-07-14 3:40 ` kernel test robot 2020-07-14 3:40 ` [Intel-gfx] " kernel test robot 2020-07-14 15:10 ` kernel test robot 2020-07-14 15:10 ` kernel test robot 2020-07-14 15:10 ` [Intel-gfx] " kernel test robot 2020-07-14 17:04 ` kernel test robot 2020-07-14 17:04 ` kernel test robot 2020-07-14 17:04 ` [Intel-gfx] " kernel test robot 2020-07-14 17:04 ` [RFC PATCH] drm/i915: g4x_get_flip_counter() can be static kernel test robot 2020-07-14 17:04 ` kernel test robot 2020-07-14 17:04 ` [Intel-gfx] " kernel test robot 2020-07-14 1:27 ` [PATCH v4 2/5] drm/i915: Add support for async flips in I915 Karthik B S 2020-07-14 1:27 ` [Intel-gfx] " Karthik B S 2020-07-14 1:27 ` [PATCH v4 3/5] drm/i915: Add checks specific to async flips Karthik B S 2020-07-14 1:27 ` [Intel-gfx] " Karthik B S 2020-07-14 1:27 ` Karthik B S [this message] 2020-07-14 1:27 ` [Intel-gfx] [PATCH v4 4/5] drm/i915: Do not call drm_crtc_arm_vblank_event in " Karthik B S 2020-07-14 1:27 ` [PATCH v4 5/5] drm/i915: Enable async flips in i915 Karthik B S 2020-07-14 1:27 ` [Intel-gfx] " Karthik B S 2020-07-14 1:58 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Asynchronous flip implementation for i915 (rev4) Patchwork 2020-07-14 1:59 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2020-07-14 2:19 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2020-07-14 3:21 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200714012725.18383-5-karthik.b.s@intel.com \ --to=karthik.b.s@intel.com \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=nicholas.kazlauskas@amd.com \ --cc=paulo.r.zanoni@intel.com \ --cc=uma.shankar@intel.com \ --cc=vandita.kulkarni@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.