Commit 33f2069f authored by Christian König's avatar Christian König

drm/nouveau: support more than one write fence in fenv50_wndw_prepare_fb

Use dma_resv_get_singleton() here to eventually get more than one write
fence as single fence.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDaniel 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
Link: https://patchwork.freedesktop.org/patch/msgid/20220321135856.1331-14-christian.koenig@amd.com
parent 9cbbd694
...@@ -536,8 +536,6 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state) ...@@ -536,8 +536,6 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state)
struct nouveau_bo *nvbo; struct nouveau_bo *nvbo;
struct nv50_head_atom *asyh; struct nv50_head_atom *asyh;
struct nv50_wndw_ctxdma *ctxdma; struct nv50_wndw_ctxdma *ctxdma;
struct dma_resv_iter cursor;
struct dma_fence *fence;
int ret; int ret;
NV_ATOMIC(drm, "%s prepare: %p\n", plane->name, fb); 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) ...@@ -560,13 +558,11 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state)
asyw->image.handle[0] = ctxdma->object.handle; asyw->image.handle[0] = ctxdma->object.handle;
} }
dma_resv_iter_begin(&cursor, nvbo->bo.base.resv, false); ret = dma_resv_get_singleton(nvbo->bo.base.resv, false,
dma_resv_for_each_fence_unlocked(&cursor, fence) { &asyw->state.fence);
/* TODO: We only use the first writer here */ if (ret)
asyw->state.fence = dma_fence_get(fence); return ret;
break;
}
dma_resv_iter_end(&cursor);
asyw->image.offset[0] = nvbo->offset; asyw->image.offset[0] = nvbo->offset;
if (wndw->func->prepare) { if (wndw->func->prepare) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment