From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 13/65] drm/omapdrm: Annotate dma-fence critical section in commit path
Date: Mon, 26 Oct 2020 09:13:46 +0200 [thread overview]
Message-ID: <c4b4e6d9-8b2a-ee8a-7708-011827d955a3@ti.com> (raw)
In-Reply-To: <20201023122216.2373294-13-daniel.vetter@ffwll.ch>
On 23/10/2020 15:21, Daniel Vetter wrote:
> Nothing special, just put the end right after hw_done(). Note that in
> one path there's a wait for the flip/update to complete. But as far as
> I understand from comments and code that's only relevant for modesets,
> and skipped if there wasn't a modeset done on a given crtc.
>
> For a bit more clarity pull the hw_done() call out of the if/else,
> that way it's a bit clearer flow. But happy to shuffle this around as
> is seen fit.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
> ---
> drivers/gpu/drm/omapdrm/omap_drv.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
> index 2e598b8b72af..2b82a708eca6 100644
> --- a/drivers/gpu/drm/omapdrm/omap_drv.c
> +++ b/drivers/gpu/drm/omapdrm/omap_drv.c
> @@ -68,6 +68,7 @@ static void omap_atomic_commit_tail(struct drm_atomic_state *old_state)
> {
> struct drm_device *dev = old_state->dev;
> struct omap_drm_private *priv = dev->dev_private;
> + bool fence_cookie = dma_fence_begin_signalling();
>
> priv->dispc_ops->runtime_get(priv->dispc);
>
> @@ -90,8 +91,6 @@ static void omap_atomic_commit_tail(struct drm_atomic_state *old_state)
> omap_atomic_wait_for_completion(dev, old_state);
>
> drm_atomic_helper_commit_planes(dev, old_state, 0);
> -
> - drm_atomic_helper_commit_hw_done(old_state);
> } else {
> /*
> * OMAP3 DSS seems to have issues with the work-around above,
> @@ -101,10 +100,12 @@ static void omap_atomic_commit_tail(struct drm_atomic_state *old_state)
> drm_atomic_helper_commit_planes(dev, old_state, 0);
>
> drm_atomic_helper_commit_modeset_enables(dev, old_state);
> -
> - drm_atomic_helper_commit_hw_done(old_state);
> }
>
> + drm_atomic_helper_commit_hw_done(old_state);
> +
> + dma_fence_end_signalling(fence_cookie);
> +
> /*
> * Wait for completion of the page flips to ensure that old buffers
> * can't be touched by the hardware anymore before cleaning up planes.
>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tomi
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-10-26 7:13 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-21 16:32 [PATCH 1/3] drm/atomic-helpers: remove legacy_cursor_update hacks Daniel Vetter
2020-10-21 16:32 ` [PATCH 2/3] drm/vc4: Drop legacy_cursor_update override Daniel Vetter
2020-10-22 13:19 ` Maxime Ripard
2020-10-21 16:32 ` [PATCH 3/3] drm/doc: Document legacy_cursor_update better Daniel Vetter
2020-10-22 13:36 ` [PATCH 1/3] drm/atomic-helpers: remove legacy_cursor_update hacks Kazlauskas, Nicholas
2020-10-22 14:03 ` Daniel Vetter
2020-10-22 17:02 ` [Intel-gfx] " Rob Clark
2020-10-22 17:21 ` Rob Clark
2020-10-22 19:16 ` Daniel Vetter
2020-10-23 15:02 ` Rob Clark
2020-10-23 16:00 ` Daniel Vetter
2020-10-23 16:21 ` Rob Clark
2020-10-23 12:21 ` [PATCH 01/65] drm/vc4: Drop legacy_cursor_update override Daniel Vetter
2020-10-23 12:21 ` [PATCH 02/65] drm/doc: Document legacy_cursor_update better Daniel Vetter
2020-10-23 12:21 ` [PATCH 03/65] mm: Track mmu notifiers in fs_reclaim_acquire/release Daniel Vetter
[not found] ` <20201027185100.GD12824@infradead.org>
2020-10-27 19:01 ` Daniel Vetter
2020-10-23 12:21 ` [PATCH 04/65] mm: Extract might_alloc() debug check Daniel Vetter
2020-10-23 14:14 ` Vlastimil Babka
[not found] ` <20201023141619.GC20115@casper.infradead.org>
2020-10-23 14:37 ` Daniel Vetter
2020-10-23 14:45 ` Daniel Vetter
2020-10-23 20:53 ` Paul E. McKenney
2020-10-23 12:21 ` [PATCH 05/65] drm/atomic-helper: Add dma-fence annotations Daniel Vetter
2020-10-23 12:21 ` [PATCH 06/65] drm/vkms: Annotate vblank timer Daniel Vetter
2020-10-23 12:21 ` [PATCH 07/65] drm/vblank: Annotate with dma-fence signalling section Daniel Vetter
2020-10-23 12:21 ` [PATCH 08/65] drm/amdgpu: add dma-fence annotations to atomic commit path Daniel Vetter
2020-10-23 12:21 ` [PATCH 09/65] drm/komeda: Annotate dma-fence critical section in " Daniel Vetter
2020-10-23 12:21 ` [PATCH 10/65] drm/malidp: " Daniel Vetter
2020-10-28 13:27 ` Liviu Dudau
2020-10-23 12:21 ` [PATCH 11/65] drm/atmel: Use drm_atomic_helper_commit Daniel Vetter
2020-10-23 12:21 ` [PATCH 12/65] drm/imx: Annotate dma-fence critical section in commit path Daniel Vetter
2020-10-23 12:21 ` [PATCH 13/65] drm/omapdrm: " Daniel Vetter
2020-10-26 7:13 ` Tomi Valkeinen [this message]
2020-10-23 12:21 ` [PATCH 14/65] drm/rcar-du: " Daniel Vetter
2020-12-16 1:29 ` Laurent Pinchart
2020-12-16 9:41 ` Daniel Vetter
2020-10-23 12:21 ` [PATCH 15/65] drm/tegra: " Daniel Vetter
2020-10-23 12:21 ` [PATCH 16/65] drm/tidss: " Daniel Vetter
2020-10-23 12:21 ` [PATCH 17/65] drm/scheduler: use dma-fence annotations in main thread Daniel Vetter
2020-10-23 12:21 ` [PATCH 18/65] drm/amdgpu: use dma-fence annotations in cs_submit() Daniel Vetter
2020-10-23 12:21 ` [PATCH 19/65] drm/amdgpu: s/GFP_KERNEL/GFP_ATOMIC in scheduler code Daniel Vetter
2020-10-23 12:21 ` [PATCH 20/65] drm/scheduler: use dma-fence annotations in tdr work Daniel Vetter
2020-10-23 12:21 ` [PATCH 21/65] drm/amdgpu: use dma-fence annotations for gpu reset code Daniel Vetter
2020-10-23 12:21 ` [PATCH 22/65] Revert "drm/amdgpu: add fbdev suspend/resume on gpu reset" Daniel Vetter
2020-10-23 12:21 ` [PATCH 23/65] drm/i915: Annotate dma_fence_work Daniel Vetter
2020-10-23 12:21 ` [PATCH 24/65] Revert "drm/i915: Annotate dma_fence_work" Daniel Vetter
2020-10-23 12:21 ` [PATCH 25/65] drm/nouveau: Drop mutex_lock_nested for atomic Daniel Vetter
2020-10-23 12:21 ` [PATCH 26/65] drm/vmwgfx: Drop svga_lock Daniel Vetter
2020-10-23 12:21 ` [PATCH 27/65] drm/vmwgfx: Always evict vram _before_ disabling it Daniel Vetter
2020-10-23 12:21 ` [PATCH 28/65] drm/ttm: WARN_ON non-empty lru when disabling a resource manager Daniel Vetter
2020-10-23 14:54 ` Christian König
2020-10-23 14:56 ` Daniel Vetter
2020-12-11 16:30 ` Daniel Vetter
2020-10-23 12:21 ` [PATCH 29/65] s390/pci: Remove races against pte updates Daniel Vetter
2020-10-23 12:26 ` Daniel Vetter
2020-10-23 12:21 ` [PATCH 30/65] drm/exynos: Stop using frame_vector helpers Daniel Vetter
2020-10-23 12:21 ` [PATCH 31/65] drm/exynos: Use FOLL_LONGTERM for g2d cmdlists Daniel Vetter
2020-10-23 12:21 ` [PATCH 32/65] misc/habana: Stop using frame_vector helpers Daniel Vetter
2020-10-23 12:21 ` [PATCH 33/65] misc/habana: Use FOLL_LONGTERM for userptr Daniel Vetter
2020-10-23 12:21 ` [PATCH 34/65] mm/frame-vector: Use FOLL_LONGTERM Daniel Vetter
2020-10-23 12:21 ` [PATCH 35/65] media: videobuf2: Move frame_vector into media subsystem Daniel Vetter
2020-10-23 12:21 ` [PATCH 36/65] mm: Close race in generic_access_phys Daniel Vetter
2020-10-23 12:21 ` [PATCH 37/65] mm: Add unsafe_follow_pfn Daniel Vetter
2020-10-23 12:21 ` [PATCH 38/65] media/videbuf1|2: Mark follow_pfn usage as unsafe Daniel Vetter
2020-10-23 12:21 ` [PATCH 39/65] vfio/type1: Mark follow_pfn " Daniel Vetter
2020-10-23 12:21 ` [PATCH 40/65] PCI: Obey iomem restrictions for procfs mmap Daniel Vetter
2020-10-23 12:21 ` [PATCH 41/65] /dev/mem: Only set filp->f_mapping Daniel Vetter
2020-10-23 12:21 ` [PATCH 42/65] resource: Move devmem revoke code to resource framework Daniel Vetter
2020-10-23 12:21 ` [PATCH 43/65] sysfs: Support zapping of binary attr mmaps Daniel Vetter
2020-10-23 12:21 ` [PATCH 44/65] PCI: Revoke mappings like devmem Daniel Vetter
2020-10-23 12:25 ` [PATCH 01/65] drm/vc4: Drop legacy_cursor_update override Daniel Vetter
2020-10-23 12:26 ` [PATCH] drm/atomic-helpers: remove legacy_cursor_update hacks Daniel Vetter
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=c4b4e6d9-8b2a-ee8a-7708-011827d955a3@ti.com \
--to=tomi.valkeinen@ti.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).