freedreno: Fix missing rsc->seqno updates
There were a couple paths where we weren't getting valid seqno's, which
are supposed to be updated whenever the backing bo is set/changed. So
wrap that up in a helper to make it harder to mess up.
Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6575>
diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c
index 0caa3f6..803054c 100644
--- a/src/gallium/drivers/freedreno/freedreno_resource.c
+++ b/src/gallium/drivers/freedreno/freedreno_resource.c
@@ -166,6 +166,15 @@
fd_screen_unlock(screen);
}
+static inline void
+fd_resource_set_bo(struct fd_resource *rsc, struct fd_bo *bo)
+{
+ struct fd_screen *screen = fd_screen(rsc->base.screen);
+
+ rsc->bo = bo;
+ rsc->seqno = p_atomic_inc_return(&screen->rsc_seqno);
+}
+
static void
realloc_bo(struct fd_resource *rsc, uint32_t size)
{
@@ -183,8 +192,9 @@
if (rsc->bo)
fd_bo_del(rsc->bo);
- rsc->bo = fd_bo_new(screen->dev, size, flags, "%ux%ux%u@%u:%x",
+ struct fd_bo *bo = fd_bo_new(screen->dev, size, flags, "%ux%ux%u@%u:%x",
prsc->width0, prsc->height0, prsc->depth0, rsc->layout.cpp, prsc->bind);
+ fd_resource_set_bo(rsc, bo);
/* Zero out the UBWC area on allocation. This fixes intermittent failures
* with UBWC, which I suspect are due to the HW having a hard time
@@ -197,7 +207,6 @@
rsc->needs_ubwc_clear = true;
}
- rsc->seqno = p_atomic_inc_return(&screen->rsc_seqno);
util_range_set_empty(&rsc->valid_buffer_range);
fd_bc_invalidate_resource(rsc, true);
}
@@ -1077,10 +1086,12 @@
simple_mtx_init(&rsc->lock, mtx_plain);
- rsc->bo = fd_screen_bo_from_handle(pscreen, handle);
- if (!rsc->bo)
+ struct fd_bo *bo = fd_screen_bo_from_handle(pscreen, handle);
+ if (!bo)
goto fail;
+ fd_resource_set_bo(rsc, bo);
+
rsc->internal_format = tmpl->format;
rsc->layout.pitch0 = handle->stride;
slice->offset = handle->offset;
@@ -1270,7 +1281,7 @@
}
/* Share the bo with the memory object. */
- rsc->bo = fd_bo_ref(memobj->bo);
+ fd_resource_set_bo(rsc, fd_bo_ref(memobj->bo));
return prsc;
}
diff --git a/src/gallium/drivers/freedreno/freedreno_resource.h b/src/gallium/drivers/freedreno/freedreno_resource.h
index 3bc0ffb..77beda2 100644
--- a/src/gallium/drivers/freedreno/freedreno_resource.h
+++ b/src/gallium/drivers/freedreno/freedreno_resource.h
@@ -46,7 +46,7 @@
struct fd_resource {
struct pipe_resource base;
- struct fd_bo *bo;
+ struct fd_bo *bo; /* use fd_resource_set_bo() to write */
enum pipe_format internal_format;
struct fdl_layout layout;
