freedreno/a3xx/compiler: refactor trans_samp()

[mesa.git] / src / gallium / drivers / freedreno / freedreno_resource.c

diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c
index 3982ecd0f9002a0bff2305eb193126968ac54105..289f3653e12eb10939ba402498411558db630de9 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_resource.c
+++ b/src/gallium/drivers/freedreno/freedreno_resource.c
@@ -36,8 +36,26 @@
 #include "freedreno_screen.h"
 #include "freedreno_surface.h"
 #include "freedreno_context.h"
+#include "freedreno_query_hw.h"
 #include "freedreno_util.h"
 
+#include <errno.h>
+
+static void
+realloc_bo(struct fd_resource *rsc, uint32_t size)
+{
+       struct fd_screen *screen = fd_screen(rsc->base.b.screen);
+       uint32_t flags = DRM_FREEDRENO_GEM_CACHE_WCOMBINE |
+                       DRM_FREEDRENO_GEM_TYPE_KMEM; /* TODO */
+
+       if (rsc->bo)
+               fd_bo_del(rsc->bo);
+
+       rsc->bo = fd_bo_new(screen->dev, size, flags);
+       rsc->timestamp = 0;
+       rsc->dirty = false;
+}
+
 static void fd_resource_transfer_flush_region(struct pipe_context *pctx,
                struct pipe_transfer *ptrans,
                const struct pipe_box *box)
@@ -80,6 +98,7 @@ fd_resource_transfer_map(struct pipe_context *pctx,
        enum pipe_format format = prsc->format;
        uint32_t op = 0;
        char *buf;
+       int ret = 0;
 
        ptrans = util_slab_alloc(&ctx->transfer_pool);
        if (!ptrans)
@@ -95,31 +114,43 @@ fd_resource_transfer_map(struct pipe_context *pctx,
        ptrans->stride = slice->pitch * rsc->cpp;
        ptrans->layer_stride = ptrans->stride;
 
+       if (usage & PIPE_TRANSFER_READ)
+               op |= DRM_FREEDRENO_PREP_READ;
+
+       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))
+       if (!(usage & (PIPE_TRANSFER_FLUSH_EXPLICIT | PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE)))
                fd_resource_transfer_flush_region(pctx, ptrans, box);
 
+       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)
+                       goto fail;
+       }
+
        buf = fd_bo_map(rsc->bo);
        if (!buf) {
                fd_resource_transfer_unmap(pctx, ptrans);
                return NULL;
        }
 
-       if (usage & PIPE_TRANSFER_READ)
-               op |= DRM_FREEDRENO_PREP_READ;
-
-       if (usage & PIPE_TRANSFER_WRITE)
-               op |= DRM_FREEDRENO_PREP_WRITE;
-
-       if (!(usage & PIPE_TRANSFER_UNSYNCHRONIZED))
-               fd_bo_cpu_prep(rsc->bo, ctx->screen->pipe, op);
-
        *pptrans = ptrans;
 
        return buf + slice->offset +
                box->y / util_format_get_blockheight(format) * ptrans->stride +
                box->x / util_format_get_blockwidth(format) * rsc->cpp +
                box->z * slice->size0;
+
+fail:
+       fd_resource_transfer_unmap(pctx, ptrans);
+       return NULL;
 }
 
 static void
@@ -127,7 +158,8 @@ fd_resource_destroy(struct pipe_screen *pscreen,
                struct pipe_resource *prsc)
 {
        struct fd_resource *rsc = fd_resource(prsc);
-       fd_bo_del(rsc->bo);
+       if (rsc->bo)
+               fd_bo_del(rsc->bo);
        FREE(rsc);
 }
 
@@ -186,10 +218,9 @@ static struct pipe_resource *
 fd_resource_create(struct pipe_screen *pscreen,
                const struct pipe_resource *tmpl)
 {
-       struct fd_screen *screen = fd_screen(pscreen);
        struct fd_resource *rsc = CALLOC_STRUCT(fd_resource);
        struct pipe_resource *prsc = &rsc->base.b;
-       uint32_t flags, size;
+       uint32_t size;
 
        DBG("target=%d, format=%s, %ux%ux%u, array_size=%u, last_level=%u, "
                        "nr_samples=%u, usage=%u, bind=%x, flags=%x",
@@ -213,12 +244,14 @@ fd_resource_create(struct pipe_screen *pscreen,
 
        size = setup_slices(rsc);
 
-       flags = DRM_FREEDRENO_GEM_CACHE_WCOMBINE |
-                       DRM_FREEDRENO_GEM_TYPE_KMEM; /* TODO */
-
-       rsc->bo = fd_bo_new(screen->dev, size, flags);
+       realloc_bo(rsc, size);
+       if (!rsc->bo)
+               goto fail;
 
        return prsc;
+fail:
+       fd_resource_destroy(pscreen, prsc);
+       return NULL;
 }
 
 /**
@@ -251,6 +284,8 @@ fd_resource_from_handle(struct pipe_screen *pscreen,
        prsc->screen = pscreen;
 
        rsc->bo = fd_screen_bo_from_handle(pscreen, handle, &slice->pitch);
+       if (!rsc->bo)
+               goto fail;
 
        rsc->base.vtbl = &fd_resource_vtbl;
        rsc->cpp = util_format_get_blocksize(tmpl->format);
@@ -259,6 +294,10 @@ fd_resource_from_handle(struct pipe_screen *pscreen,
        assert(rsc->cpp);
 
        return prsc;
+
+fail:
+       fd_resource_destroy(pscreen, prsc);
+       return NULL;
 }
 
 static bool render_blit(struct pipe_context *pctx, struct pipe_blit_info *info);
@@ -363,11 +402,18 @@ render_blit(struct pipe_context *pctx, struct pipe_blit_info *info)
        util_blitter_save_fragment_sampler_views(ctx->blitter,
                        ctx->fragtex.num_textures, ctx->fragtex.textures);
 
+       fd_hw_query_set_stage(ctx, ctx->ring, FD_STAGE_BLIT);
        util_blitter_blit(ctx->blitter, info);
+       fd_hw_query_set_stage(ctx, ctx->ring, FD_STAGE_NULL);
 
        return true;
 }
 
+static void
+fd_flush_resource(struct pipe_context *ctx, struct pipe_resource *resource)
+{
+}
+
 void
 fd_resource_screen_init(struct pipe_screen *pscreen)
 {
@@ -388,4 +434,5 @@ fd_resource_context_init(struct pipe_context *pctx)
        pctx->surface_destroy = fd_surface_destroy;
        pctx->resource_copy_region = fd_resource_copy_region;
        pctx->blit = fd_blit;
+       pctx->flush_resource = fd_flush_resource;
 }