freedreno: fix PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE

fd_bo_cpu_prep() doesn't realize the bo is already referenced in
unflushed cmdstream.  It could be made to do so (but would have to be
implemented twice, ie. both for msm and kgsl).  But we still can't do
the expected thing if the caller isn't using _NOSYNC.  Because of the
way the tiling works, we need to build quite a bit of cmdstream at flush
time, which is not possible to do at the libdrm level.

So rather than trying to make fd_bo_cpu_prep() smarter than it can
possibly be, just *always* discard and reallocate if the
PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE flag is set.

Signed-off-by: Rob Clark <robclark@freedesktop.org>

diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c
index 49ae51715071934ec81478174dbbbe6749a1c173..6b31d263290f3443c4594a466dcd5a6dccc797ce 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_resource.c
+++ b/src/gallium/drivers/freedreno/freedreno_resource.c
@@ -104,6 +104,8 @@ fd_resource_transfer_map(struct pipe_context *pctx,
        char *buf;
        int ret = 0;
 
+       DBG("prsc=%p, level=%u, usage=%x", prsc, level, usage);
+
        ptrans = util_slab_alloc(&ctx->transfer_pool);
        if (!ptrans)
                return NULL;
@@ -124,18 +126,15 @@ fd_resource_transfer_map(struct pipe_context *pctx,
        if (usage & PIPE_TRANSFER_WRITE)
                op |= DRM_FREEDRENO_PREP_WRITE;
 
-       if (usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE)
-               op |= DRM_FREEDRENO_PREP_NOSYNC;
-
        /* some state trackers (at least XA) don't do this.. */
        if (!(usage & (PIPE_TRANSFER_FLUSH_EXPLICIT | PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE)))
                fd_resource_transfer_flush_region(pctx, ptrans, box);
 
-       if (!(usage & PIPE_TRANSFER_UNSYNCHRONIZED)) {
+       if (usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE) {
+               realloc_bo(rsc, fd_bo_size(rsc->bo));
+       } else if (!(usage & PIPE_TRANSFER_UNSYNCHRONIZED)) {
                ret = fd_bo_cpu_prep(rsc->bo, ctx->screen->pipe, op);
-               if ((ret == -EBUSY) && (usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE))
-                       realloc_bo(rsc, fd_bo_size(rsc->bo));
-               else if (ret)
+               if (ret)
                        goto fail;
        }