From: "Christian König" <ckoenig.leichtzumerken@gmail.com> To: daniel.vetter@ffwll.ch, dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org, "Maxime Ripard" <maxime@cerno.tech>, "Christian König" <christian.koenig@amd.com>, "Laurent Pinchart" <laurent.pinchart@ideasonboard.com> Subject: [Nouveau] [PATCH 14/23] drm/nouveau: support more than one write fence in fenv50_wndw_prepare_fb Date: Mon, 21 Mar 2022 14:58:47 +0100 [thread overview] Message-ID: <20220321135856.1331-14-christian.koenig@amd.com> (raw) In-Reply-To: <20220321135856.1331-1-christian.koenig@amd.com> Use dma_resv_get_singleton() here to eventually get more than one write fence as single fence. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Maxime Ripard <maxime@cerno.tech> Cc: Lyude Paul <lyude@redhat.com> Cc: nouveau@lists.freedesktop.org --- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c index 0c1a2ea0ed04..e2faf92e4831 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c @@ -536,8 +536,6 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state) struct nouveau_bo *nvbo; struct nv50_head_atom *asyh; struct nv50_wndw_ctxdma *ctxdma; - struct dma_resv_iter cursor; - struct dma_fence *fence; int ret; NV_ATOMIC(drm, "%s prepare: %p\n", plane->name, fb); @@ -560,13 +558,11 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state) asyw->image.handle[0] = ctxdma->object.handle; } - dma_resv_iter_begin(&cursor, nvbo->bo.base.resv, false); - dma_resv_for_each_fence_unlocked(&cursor, fence) { - /* TODO: We only use the first writer here */ - asyw->state.fence = dma_fence_get(fence); - break; - } - dma_resv_iter_end(&cursor); + ret = dma_resv_get_singleton(nvbo->bo.base.resv, false, + &asyw->state.fence); + if (ret) + return ret; + asyw->image.offset[0] = nvbo->offset; if (wndw->func->prepare) { -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: "Christian König" <ckoenig.leichtzumerken@gmail.com> To: daniel.vetter@ffwll.ch, dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org, "Maxime Ripard" <maxime@cerno.tech>, "Thomas Zimmermann" <tzimmermann@suse.de>, "Christian König" <christian.koenig@amd.com>, "Laurent Pinchart" <laurent.pinchart@ideasonboard.com> Subject: [PATCH 14/23] drm/nouveau: support more than one write fence in fenv50_wndw_prepare_fb Date: Mon, 21 Mar 2022 14:58:47 +0100 [thread overview] Message-ID: <20220321135856.1331-14-christian.koenig@amd.com> (raw) In-Reply-To: <20220321135856.1331-1-christian.koenig@amd.com> Use dma_resv_get_singleton() here to eventually get more than one write fence as single fence. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Maxime Ripard <maxime@cerno.tech> Cc: Lyude Paul <lyude@redhat.com> Cc: nouveau@lists.freedesktop.org --- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c index 0c1a2ea0ed04..e2faf92e4831 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c @@ -536,8 +536,6 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state) struct nouveau_bo *nvbo; struct nv50_head_atom *asyh; struct nv50_wndw_ctxdma *ctxdma; - struct dma_resv_iter cursor; - struct dma_fence *fence; int ret; NV_ATOMIC(drm, "%s prepare: %p\n", plane->name, fb); @@ -560,13 +558,11 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state) asyw->image.handle[0] = ctxdma->object.handle; } - dma_resv_iter_begin(&cursor, nvbo->bo.base.resv, false); - dma_resv_for_each_fence_unlocked(&cursor, fence) { - /* TODO: We only use the first writer here */ - asyw->state.fence = dma_fence_get(fence); - break; - } - dma_resv_iter_end(&cursor); + ret = dma_resv_get_singleton(nvbo->bo.base.resv, false, + &asyw->state.fence); + if (ret) + return ret; + asyw->image.offset[0] = nvbo->offset; if (wndw->func->prepare) { -- 2.25.1
next prev parent reply other threads:[~2022-03-21 13:59 UTC|newest] Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-03-21 13:58 [PATCH 01/23] dma-buf: add dma_resv_replace_fences v2 Christian König 2022-03-21 13:58 ` [PATCH 02/23] dma-buf: finally make the dma_resv_list private v2 Christian König 2022-03-21 13:58 ` [PATCH 03/23] dma-buf: add dma_resv_get_singleton v2 Christian König 2022-04-01 8:21 ` Christian König 2022-04-01 15:57 ` Daniel Vetter 2022-03-21 13:58 ` [PATCH 04/23] RDMA: use dma_resv_wait() instead of extracting the fence Christian König 2022-03-21 13:58 ` Christian König 2022-03-23 13:22 ` Daniel Vetter 2022-03-23 13:22 ` Daniel Vetter 2022-03-23 16:32 ` Jason Gunthorpe 2022-03-23 16:32 ` Jason Gunthorpe 2022-03-23 17:34 ` Daniel Vetter 2022-03-23 17:34 ` Daniel Vetter 2022-03-21 13:58 ` [PATCH 05/23] drm/etnaviv: stop using dma_resv_excl_fence Christian König 2022-03-23 15:58 ` Lucas Stach 2022-03-21 13:58 ` [Nouveau] [PATCH 06/23] drm/nouveau: " Christian König 2022-03-21 13:58 ` Christian König 2022-04-03 15:59 ` [Nouveau] " Christian König 2022-04-03 15:59 ` Christian König 2022-04-04 11:47 ` [Nouveau] " Karol Herbst 2022-04-04 11:47 ` Karol Herbst 2022-04-05 7:25 ` [Nouveau] " Christian König 2022-04-05 7:25 ` Christian König 2022-03-21 13:58 ` [PATCH 07/23] drm/vmwgfx: " Christian König 2022-03-21 14:02 ` Zack Rusin 2022-03-21 14:12 ` Christian König 2022-03-21 15:11 ` Zack Rusin 2022-03-22 7:13 ` Christian König 2022-03-22 12:40 ` Zack Rusin 2022-03-21 13:58 ` [PATCH 08/23] drm/radeon: " Christian König 2022-03-21 13:58 ` [PATCH 09/23] drm/amdgpu: use dma_resv_for_each_fence for CS workaround Christian König 2022-03-21 13:58 ` [PATCH 10/23] dma-buf: finally make dma_resv_excl_fence private v2 Christian König 2022-03-23 13:36 ` Daniel Vetter 2022-04-05 7:58 ` Christian König 2022-03-21 13:58 ` [PATCH 11/23] dma-buf: drop the DAG approach for the dma_resv object v2 Christian König 2022-03-23 13:40 ` Daniel Vetter 2022-03-21 13:58 ` [PATCH 12/23] dma-buf/drivers: make reserving a shared slot mandatory v3 Christian König 2022-03-28 17:14 ` Daniel Vetter 2022-03-31 12:07 ` Christian König 2022-03-31 16:42 ` Daniel Vetter 2022-03-21 13:58 ` [PATCH 13/23] drm/atomic-helper: support more than one write fence in drm_gem_plane_helper_prepare_fb Christian König 2022-03-21 13:58 ` Christian König [this message] 2022-03-21 13:58 ` [PATCH 14/23] drm/nouveau: support more than one write fence in fenv50_wndw_prepare_fb Christian König 2022-03-21 13:58 ` [PATCH 15/23] drm/amdgpu: use dma_resv_get_singleton in amdgpu_pasid_free_cb Christian König 2022-03-21 13:58 ` [PATCH 16/23] dma-buf: add enum dma_resv_usage v3 Christian König 2022-03-29 15:24 ` Daniel Vetter 2022-04-04 1:13 ` Bas Nieuwenhuizen 2022-03-21 13:58 ` [PATCH 17/23] dma-buf: specify usage while adding fences to dma_resv obj v5 Christian König 2022-03-29 15:43 ` Daniel Vetter 2022-04-01 15:01 ` Christian König 2022-04-01 16:16 ` Daniel Vetter 2022-04-02 22:16 ` Bas Nieuwenhuizen 2022-04-03 17:48 ` Christian König 2022-03-21 13:58 ` [PATCH 18/23] drm/amdgpu: remove dma_resv workaround Christian König 2022-03-29 15:47 ` Daniel Vetter 2022-03-21 13:58 ` [PATCH 19/23] dma-buf: add DMA_RESV_USAGE_KERNEL v2 Christian König 2022-03-29 15:53 ` Daniel Vetter 2022-03-21 13:58 ` [PATCH 20/23] dma-buf: add DMA_RESV_USAGE_BOOKKEEP v2 Christian König 2022-03-29 16:06 ` Daniel Vetter 2022-03-21 13:58 ` [PATCH 21/23] dma-buf: wait for map to complete for static attachments Christian König 2022-03-29 15:56 ` Daniel Vetter 2022-03-21 13:58 ` [PATCH 22/23] drm/i915: drop bo->moving dependency Christian König 2022-03-21 13:58 ` [Intel-gfx] " Christian König 2022-03-29 15:57 ` Daniel Vetter 2022-03-29 15:57 ` [Intel-gfx] " Daniel Vetter 2022-03-21 13:58 ` [PATCH 23/23] drm/ttm: remove bo->moving Christian König 2022-03-29 16:02 ` Daniel Vetter 2022-04-05 9:25 ` Christian König 2022-04-05 12:51 ` Daniel Vetter 2022-03-21 14:03 ` [PATCH 01/23] dma-buf: add dma_resv_replace_fences v2 Christian König 2022-03-23 13:09 ` Daniel Vetter 2022-03-23 15:55 ` Felix Kuehling 2022-03-23 15:57 ` Christian König
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=20220321135856.1331-14-christian.koenig@amd.com \ --to=ckoenig.leichtzumerken@gmail.com \ --cc=christian.koenig@amd.com \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=laurent.pinchart@ideasonboard.com \ --cc=maxime@cerno.tech \ --cc=nouveau@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: 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.