panfrost: Add ETC1/ETC2 texture formats
[mesa.git] / src / gallium / drivers / panfrost / pan_resource.c
index 73f987c45bcf0160a913fa3790acd9334459d0b0..aac1e8cf19d53c185c703507808aff9d0324d4cf 100644 (file)
@@ -1,48 +1,64 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * Copyright 2014 Broadcom
- * Copyright 2018 Alyssa Rosenzweig
- * All Rights Reserved.
+/*
+ * Copyright (C) 2008 VMware, Inc.
+ * Copyright (C) 2014 Broadcom
+ * Copyright (C) 2018-2019 Alyssa Rosenzweig
+ * Copyright (C) 2019 Collabora, Ltd.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
  *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Authors (Collabora):
+ *   Tomeu Vizoso <tomeu.vizoso@collabora.com>
+ *   Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
  *
- **************************************************************************/
+ */
 
 #include <xf86drm.h>
 #include <fcntl.h>
 #include "drm-uapi/drm_fourcc.h"
 
 #include "state_tracker/winsys_handle.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_memory.h"
 #include "util/u_surface.h"
 #include "util/u_transfer.h"
 #include "util/u_transfer_helper.h"
+#include "util/u_gen_mipmap.h"
 
+#include "pan_bo.h"
 #include "pan_context.h"
 #include "pan_screen.h"
 #include "pan_resource.h"
-#include "pan_swizzle.h"
 #include "pan_util.h"
+#include "pan_tiling.h"
+#include "panfrost-quirks.h"
+
+void
+panfrost_resource_reset_damage(struct panfrost_resource *pres)
+{
+        /* We set the damage extent to the full resource size but keep the
+         * damage box empty so that the FB content is reloaded by default.
+         */
+        memset(&pres->damage, 0, sizeof(pres->damage));
+        pres->damage.extent.maxx = pres->base.width0;
+        pres->damage.extent.maxy = pres->base.height0;
+}
 
 static struct pipe_resource *
 panfrost_resource_from_handle(struct pipe_screen *pscreen,
@@ -56,7 +72,7 @@ panfrost_resource_from_handle(struct pipe_screen *pscreen,
 
         assert(whandle->type == WINSYS_HANDLE_TYPE_FD);
 
-        rsc = CALLOC_STRUCT(panfrost_resource);
+        rsc = rzalloc(pscreen, struct panfrost_resource);
         if (!rsc)
                 return NULL;
 
@@ -67,19 +83,23 @@ panfrost_resource_from_handle(struct pipe_screen *pscreen,
         pipe_reference_init(&prsc->reference, 1);
         prsc->screen = pscreen;
 
-       rsc->bo = screen->driver->import_bo(screen, whandle);
-       rsc->bo->slices[0].stride = whandle->stride;
-
-       if (screen->ro) {
-               rsc->scanout =
-                       renderonly_create_gpu_import_for_resource(prsc, screen->ro, NULL);
-               /* failure is expected in some cases.. */
-       }
+        rsc->bo = panfrost_bo_import(screen, whandle->handle);
+        rsc->internal_format = templat->format;
+        rsc->slices[0].stride = whandle->stride;
+        rsc->slices[0].offset = whandle->offset;
+        rsc->slices[0].initialized = true;
+        panfrost_resource_reset_damage(rsc);
+
+        if (screen->ro) {
+                rsc->scanout =
+                        renderonly_create_gpu_import_for_resource(prsc, screen->ro, NULL);
+                /* failure is expected in some cases.. */
+        }
 
         return prsc;
 }
 
-static boolean
+static bool
 panfrost_resource_get_handle(struct pipe_screen *pscreen,
                              struct pipe_context *ctx,
                              struct pipe_resource *pt,
@@ -92,16 +112,17 @@ panfrost_resource_get_handle(struct pipe_screen *pscreen,
 
         handle->modifier = DRM_FORMAT_MOD_INVALID;
 
-       if (handle->type == WINSYS_HANDLE_TYPE_SHARED) {
-               return FALSE;
-       } else if (handle->type == WINSYS_HANDLE_TYPE_KMS) {
-               if (renderonly_get_handle(scanout, handle))
-                       return TRUE;
-
-               handle->handle = rsrc->bo->gem_handle;
-               handle->stride = rsrc->bo->slices[0].stride;
-               return TRUE;
-       } else if (handle->type == WINSYS_HANDLE_TYPE_FD) {
+        if (handle->type == WINSYS_HANDLE_TYPE_SHARED) {
+                return false;
+        } else if (handle->type == WINSYS_HANDLE_TYPE_KMS) {
+                if (renderonly_get_handle(scanout, handle))
+                        return true;
+
+                handle->handle = rsrc->bo->gem_handle;
+                handle->stride = rsrc->slices[0].stride;
+                handle->offset = rsrc->slices[0].offset;
+                return TRUE;
+        } else if (handle->type == WINSYS_HANDLE_TYPE_FD) {
                 if (scanout) {
                         struct drm_prime_handle args = {
                                 .handle = scanout->handle,
@@ -110,17 +131,26 @@ panfrost_resource_get_handle(struct pipe_screen *pscreen,
 
                         int ret = drmIoctl(screen->ro->kms_fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &args);
                         if (ret == -1)
-                                return FALSE;
+                                return false;
 
                         handle->stride = scanout->stride;
                         handle->handle = args.fd;
 
-                        return TRUE;
-                } else
-                       return screen->driver->export_bo(screen, rsrc->bo->gem_handle, rsrc->bo->slices[0].stride, handle);
-       }
+                        return true;
+                } else {
+                        int fd = panfrost_bo_export(rsrc->bo);
+
+                        if (fd < 0)
+                                return false;
+
+                        handle->handle = fd;
+                        handle->stride = rsrc->slices[0].stride;
+                        handle->offset = rsrc->slices[0].offset;
+                        return true;
+                }
+        }
 
-       return FALSE;
+        return false;
 }
 
 static void
@@ -129,19 +159,6 @@ panfrost_flush_resource(struct pipe_context *pctx, struct pipe_resource *prsc)
         //DBG("TODO %s\n", __func__);
 }
 
-static void
-panfrost_blit(struct pipe_context *pipe,
-              const struct pipe_blit_info *info)
-{
-        if (util_try_blit_via_copy_region(pipe, info))
-                return;
-
-        /* TODO */
-        DBG("Unhandled blit.\n");
-
-        return;
-}
-
 static struct pipe_surface *
 panfrost_create_surface(struct pipe_context *pipe,
                         struct pipe_resource *pt,
@@ -149,7 +166,7 @@ panfrost_create_surface(struct pipe_context *pipe,
 {
         struct pipe_surface *ps = NULL;
 
-        ps = CALLOC_STRUCT(pipe_surface);
+        ps = rzalloc(pipe, struct pipe_surface);
 
         if (ps) {
                 pipe_reference_init(&ps->reference, 1);
@@ -184,51 +201,184 @@ panfrost_surface_destroy(struct pipe_context *pipe,
 {
         assert(surf->texture);
         pipe_resource_reference(&surf->texture, NULL);
-        free(surf);
+        ralloc_free(surf);
 }
 
+static struct pipe_resource *
+panfrost_create_scanout_res(struct pipe_screen *screen,
+                            const struct pipe_resource *template)
+{
+        struct panfrost_screen *pscreen = pan_screen(screen);
+        struct pipe_resource scanout_templat = *template;
+        struct renderonly_scanout *scanout;
+        struct winsys_handle handle;
+        struct pipe_resource *res;
+
+        scanout = renderonly_scanout_for_resource(&scanout_templat,
+                        pscreen->ro, &handle);
+        if (!scanout)
+                return NULL;
+
+        assert(handle.type == WINSYS_HANDLE_TYPE_FD);
+        /* TODO: handle modifiers? */
+        res = screen->resource_from_handle(screen, template, &handle,
+                                           PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE);
+        close(handle.handle);
+        if (!res)
+                return NULL;
+
+        struct panfrost_resource *pres = pan_resource(res);
+
+        pres->scanout = scanout;
+
+        return res;
+}
+
+/* Computes sizes for checksumming, which is 8 bytes per 16x16 tile */
+
+#define CHECKSUM_TILE_WIDTH 16
+#define CHECKSUM_TILE_HEIGHT 16
+#define CHECKSUM_BYTES_PER_TILE 8
+
+static unsigned
+panfrost_compute_checksum_sizes(
+        struct panfrost_slice *slice,
+        unsigned width,
+        unsigned height)
+{
+        unsigned aligned_width = ALIGN_POT(width, CHECKSUM_TILE_WIDTH);
+        unsigned aligned_height = ALIGN_POT(height, CHECKSUM_TILE_HEIGHT);
+
+        unsigned tile_count_x = aligned_width / CHECKSUM_TILE_WIDTH;
+        unsigned tile_count_y = aligned_height / CHECKSUM_TILE_HEIGHT;
+
+        slice->checksum_stride = tile_count_x * CHECKSUM_BYTES_PER_TILE;
+
+        return slice->checksum_stride * tile_count_y;
+}
+
+/* Setup the mip tree given a particular layout, possibly with checksumming */
+
 static void
-panfrost_setup_slices(const struct pipe_resource *tmpl, struct panfrost_bo *bo)
+panfrost_setup_slices(struct panfrost_resource *pres, size_t *bo_size)
 {
-        unsigned width = tmpl->width0;
-        unsigned height = tmpl->height0;
-        unsigned bytes_per_pixel = util_format_get_blocksize(tmpl->format);
+        struct pipe_resource *res = &pres->base;
+        unsigned width = res->width0;
+        unsigned height = res->height0;
+        unsigned depth = res->depth0;
+        unsigned bytes_per_pixel = util_format_get_blocksize(res->format);
+
+        assert(depth > 0);
+
+        /* Tiled operates blockwise; linear is packed. Also, anything
+         * we render to has to be tile-aligned. Maybe not strictly
+         * necessary, but we're not *that* pressed for memory and it
+         * makes code a lot simpler */
+
+        bool renderable = res->bind &
+                          (PIPE_BIND_RENDER_TARGET | PIPE_BIND_DEPTH_STENCIL);
+        bool afbc = pres->layout == PAN_AFBC;
+        bool tiled = pres->layout == PAN_TILED;
+        bool should_align = renderable || tiled;
+
+        /* We don't know how to specify a 2D stride for 3D textures */
+
+        bool can_align_stride =
+                res->target != PIPE_TEXTURE_3D;
+
+        should_align &= can_align_stride;
 
         unsigned offset = 0;
+        unsigned size_2d = 0;
 
-        for (unsigned l = 0; l <= tmpl->last_level; ++l) {
-                struct panfrost_slice *slice = &bo->slices[l];
+        for (unsigned l = 0; l <= res->last_level; ++l) {
+                struct panfrost_slice *slice = &pres->slices[l];
 
                 unsigned effective_width = width;
                 unsigned effective_height = height;
+                unsigned effective_depth = depth;
 
-                /* Tiled operates blockwise; linear is packed */
+                if (should_align) {
+                        effective_width = ALIGN_POT(effective_width, 16);
+                        effective_height = ALIGN_POT(effective_height, 16);
 
-                if (bo->layout == PAN_TILED) {
-                        effective_width = ALIGN(effective_width, 16);
-                        effective_height = ALIGN(effective_height, 16);
+                        /* We don't need to align depth */
                 }
 
+                /* Align levels to cache-line as a performance improvement for
+                 * linear/tiled and as a requirement for AFBC */
+
+                offset = ALIGN_POT(offset, 64);
+
                 slice->offset = offset;
-                slice->stride = bytes_per_pixel * effective_width;
 
-                offset += slice->stride * effective_height;
+                /* Compute the would-be stride */
+                unsigned stride = bytes_per_pixel * effective_width;
+
+                if (util_format_is_compressed(res->format))
+                        stride /= 4;
+
+                /* ..but cache-line align it for performance */
+                if (can_align_stride && pres->layout == PAN_LINEAR)
+                        stride = ALIGN_POT(stride, 64);
+
+                slice->stride = stride;
+
+                unsigned slice_one_size = slice->stride * effective_height;
+                unsigned slice_full_size = slice_one_size * effective_depth;
+
+                slice->size0 = slice_one_size;
+
+                /* Report 2D size for 3D texturing */
+
+                if (l == 0)
+                        size_2d = slice_one_size;
+
+                /* Compute AFBC sizes if necessary */
+                if (afbc) {
+                        slice->header_size =
+                                panfrost_afbc_header_size(width, height);
+
+                        offset += slice->header_size;
+                }
+
+                offset += slice_full_size;
+
+                /* Add a checksum region if necessary */
+                if (pres->checksummed) {
+                        slice->checksum_offset = offset;
+
+                        unsigned size = panfrost_compute_checksum_sizes(
+                                                slice, width, height);
+
+                        offset += size;
+                }
 
                 width = u_minify(width, 1);
                 height = u_minify(height, 1);
+                depth = u_minify(depth, 1);
         }
 
-        assert(tmpl->array_size);
+        assert(res->array_size);
+
+        if (res->target != PIPE_TEXTURE_3D) {
+                /* Arrays and cubemaps have the entire miptree duplicated */
 
-        bo->cubemap_stride = ALIGN(offset, 64);
-        bo->size = ALIGN(bo->cubemap_stride * tmpl->array_size, 4096);
+                pres->cubemap_stride = ALIGN_POT(offset, 64);
+                *bo_size = ALIGN_POT(pres->cubemap_stride * res->array_size, 4096);
+        } else {
+                /* 3D strides across the 2D layers */
+                assert(res->array_size == 1);
+
+                pres->cubemap_stride = size_2d;
+                *bo_size = ALIGN_POT(offset, 4096);
+        }
 }
 
-static struct panfrost_bo *
-panfrost_create_bo(struct panfrost_screen *screen, const struct pipe_resource *template)
+static void
+panfrost_resource_create_bo(struct panfrost_screen *screen, struct panfrost_resource *pres)
 {
-       struct panfrost_bo *bo = CALLOC_STRUCT(panfrost_bo);
-        pipe_reference_init(&bo->reference, 1);
+        struct pipe_resource *res = &pres->base;
 
         /* Based on the usage, figure out what storing will be used. There are
          * various tradeoffs:
@@ -238,146 +388,156 @@ panfrost_create_bo(struct panfrost_screen *screen, const struct pipe_resource *t
          *
          * Tiled: Not compressed, but cache-optimized. Expensive to write into
          * (due to software tiling), but cheap to sample from. Ideal for most
-         * textures. 
+         * textures.
          *
          * AFBC: Compressed and renderable (so always desirable for non-scanout
          * rendertargets). Cheap to sample from. The format is black box, so we
          * can't read/write from software.
-         */
-
-        /* Tiling textures is almost always faster, unless we only use it once */
-        bool should_tile = (template->usage != PIPE_USAGE_STREAM) && (template->bind & PIPE_BIND_SAMPLER_VIEW);
-
-        /* For unclear reasons, depth/stencil is faster linear than AFBC, so
-         * make sure it's linear */
-
-        if (template->bind & PIPE_BIND_DEPTH_STENCIL)
-                should_tile = false;
+         *
+         * Tiling textures is almost always faster, unless we only use it once.
+         * Only a few types of resources can be tiled, ensure the bind is only
+         * (a combination of) one of the following */
+
+        const unsigned valid_binding =
+                PIPE_BIND_DEPTH_STENCIL |
+                PIPE_BIND_RENDER_TARGET |
+                PIPE_BIND_BLENDABLE |
+                PIPE_BIND_SAMPLER_VIEW |
+                PIPE_BIND_DISPLAY_TARGET;
+
+        unsigned bpp = util_format_get_blocksizebits(res->format);
+        bool is_2d = (res->target == PIPE_TEXTURE_2D);
+        bool is_sane_bpp = bpp == 8 || bpp == 16 || bpp == 32 || bpp == 64 || bpp == 128;
+        bool should_tile = (res->usage != PIPE_USAGE_STREAM);
+        bool must_tile = (res->bind & PIPE_BIND_DEPTH_STENCIL) && (screen->quirks & MIDGARD_SFBD);
+        bool can_tile = is_2d && is_sane_bpp && ((res->bind & ~valid_binding) == 0);
+
+        /* FBOs we would like to checksum, if at all possible */
+        bool can_checksum = !(res->bind & ~valid_binding);
+        bool should_checksum = res->bind & PIPE_BIND_RENDER_TARGET;
+
+        pres->checksummed = can_checksum && should_checksum;
 
         /* Set the layout appropriately */
-        bo->layout = should_tile ? PAN_TILED : PAN_LINEAR;
+        assert(!(must_tile && !can_tile)); /* must_tile => can_tile */
+        pres->layout = ((can_tile && should_tile) || must_tile) ? PAN_TILED : PAN_LINEAR;
 
-        panfrost_setup_slices(template, bo);
+        size_t bo_size;
 
-        if (bo->layout == PAN_TILED || bo->layout == PAN_LINEAR) {
-                struct panfrost_memory mem;
+        panfrost_setup_slices(pres, &bo_size);
 
-                screen->driver->allocate_slab(screen, &mem, bo->size / 4096, true, 0, 0, 0);
+        /* We create a BO immediately but don't bother mapping, since we don't
+         * care to map e.g. FBOs which the CPU probably won't touch */
+        pres->bo = panfrost_bo_create(screen, bo_size, PAN_BO_DELAY_MMAP);
+}
 
-                bo->cpu = mem.cpu;
-                bo->gpu = mem.gpu;
-                bo->gem_handle = mem.gem_handle;
-        }
+void
+panfrost_resource_set_damage_region(struct pipe_screen *screen,
+                                    struct pipe_resource *res,
+                                    unsigned int nrects,
+                                    const struct pipe_box *rects)
+{
+        struct panfrost_resource *pres = pan_resource(res);
+        struct pipe_box *damage_rect = &pres->damage.biggest_rect;
+        struct pipe_scissor_state *damage_extent = &pres->damage.extent;
+        unsigned int i;
+
+       if (!nrects) {
+               panfrost_resource_reset_damage(pres);
+               return;
+       }
 
-        return bo;
+        /* We keep track of 2 different things here:
+         * 1 the damage extent: the quad including all damage regions. Will be
+         *   used restrict the rendering area
+         * 2 the biggest damage rectangle: when there are more than one damage
+         *   rect we keep the biggest one and will generate 4 wallpaper quads
+         *   out of it (see panfrost_draw_wallpaper() for more details). We
+         *   might want to do something smarter at some point.
+         *
+         *                _________________________________
+         *                |                               |
+         *                |    _________________________  |
+         *                |   | rect1|         _________| |
+         *                |   |______|_____   | rect 3: | |
+         *                |   |    | rect2 |  | biggest | |
+         *                |   |    |_______|  |  rect   | |
+         *                |   |_______________|_________| |
+         *                |        damage extent          |
+         *                |_______________________________|
+         *                            resource
+         */
+        memset(&pres->damage, 0, sizeof(pres->damage));
+        damage_extent->minx = 0xffff;
+        damage_extent->miny = 0xffff;
+        for (i = 0; i < nrects; i++) {
+                int x = rects[i].x, w = rects[i].width, h = rects[i].height;
+                int y = res->height0 - (rects[i].y + h);
+
+                /* Clamp x,y,w,h to prevent negative values. */
+                if (x < 0) {
+                        h += x;
+                        x = 0;
+                }
+                if (y < 0) {
+                        w += y;
+                        y = 0;
+                }
+                w = MAX2(w, 0);
+                h = MAX2(h, 0);
+
+                if (damage_rect->width * damage_rect->height < w * h)
+                       u_box_2d(x, y, w, h, damage_rect);
+
+                damage_extent->minx = MIN2(damage_extent->minx, x);
+                damage_extent->miny = MIN2(damage_extent->miny, y);
+                damage_extent->maxx = MAX2(damage_extent->maxx,
+                                           MIN2(x + w, res->width0));
+                damage_extent->maxy = MAX2(damage_extent->maxy,
+                                           MIN2(y + h, res->height0));
+        }
 }
 
 static struct pipe_resource *
 panfrost_resource_create(struct pipe_screen *screen,
                          const struct pipe_resource *template)
 {
-        struct panfrost_resource *so = CALLOC_STRUCT(panfrost_resource);
+        /* Make sure we're familiar */
+        switch (template->target) {
+        case PIPE_BUFFER:
+        case PIPE_TEXTURE_1D:
+        case PIPE_TEXTURE_2D:
+        case PIPE_TEXTURE_3D:
+        case PIPE_TEXTURE_CUBE:
+        case PIPE_TEXTURE_RECT:
+        case PIPE_TEXTURE_2D_ARRAY:
+                break;
+        default:
+                DBG("Unknown texture target %d\n", template->target);
+                assert(0);
+        }
+
+        if (template->bind &
+            (PIPE_BIND_DISPLAY_TARGET | PIPE_BIND_SCANOUT | PIPE_BIND_SHARED))
+                return panfrost_create_scanout_res(screen, template);
+
+        struct panfrost_resource *so = rzalloc(screen, struct panfrost_resource);
         struct panfrost_screen *pscreen = (struct panfrost_screen *) screen;
 
         so->base = *template;
         so->base.screen = screen;
+        so->internal_format = template->format;
 
         pipe_reference_init(&so->base.reference, 1);
 
-        /* Make sure we're familiar */
-        switch (template->target) {
-                case PIPE_BUFFER:
-                case PIPE_TEXTURE_1D:
-                case PIPE_TEXTURE_2D:
-                case PIPE_TEXTURE_3D:
-                case PIPE_TEXTURE_CUBE:
-                case PIPE_TEXTURE_RECT:
-                        break;
-                default:
-                        DBG("Unknown texture target %d\n", template->target);
-                        assert(0);
-        }
-
         util_range_init(&so->valid_buffer_range);
 
-        if (template->bind & PIPE_BIND_DISPLAY_TARGET ||
-            template->bind & PIPE_BIND_SCANOUT ||
-            template->bind & PIPE_BIND_SHARED) {
-                struct pipe_resource scanout_templat = *template;
-                struct renderonly_scanout *scanout;
-                struct winsys_handle handle;
-
-                scanout = renderonly_scanout_for_resource(&scanout_templat,
-                                                          pscreen->ro, &handle);
-                if (!scanout)
-                        return NULL;
-
-                assert(handle.type == WINSYS_HANDLE_TYPE_FD);
-                /* TODO: handle modifiers? */
-                so = pan_resource(screen->resource_from_handle(screen, template,
-                                                                 &handle,
-                                                                 PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE));
-                close(handle.handle);
-                if (!so)
-                        return NULL;
-
-                so->scanout = scanout;
-                pscreen->display_target = so;
-        } else {
-                so->bo = panfrost_create_bo(pscreen, template);
-        }
+        panfrost_resource_create_bo(pscreen, so);
+        panfrost_resource_reset_damage(so);
 
         return (struct pipe_resource *)so;
 }
 
-static void
-panfrost_destroy_bo(struct panfrost_screen *screen, struct panfrost_bo *pbo)
-{
-       struct panfrost_bo *bo = (struct panfrost_bo *)pbo;
-
-        if ((bo->layout == PAN_LINEAR || bo->layout == PAN_TILED) &&
-                        !bo->imported) {
-                struct panfrost_memory mem = {
-                        .cpu = bo->cpu,
-                        .gpu = bo->gpu,
-                        .size = bo->size,
-                        .gem_handle = bo->gem_handle,
-                };
-
-                screen->driver->free_slab(screen, &mem);
-        }
-
-        if (bo->layout == PAN_AFBC) {
-                /* TODO */
-                DBG("--leaking afbc (%d bytes)--\n", bo->afbc_metadata_size);
-        }
-
-        if (bo->has_checksum) {
-                /* TODO */
-                DBG("--leaking checksum (%zd bytes)--\n", bo->checksum_slab.size);
-        }
-
-        if (bo->imported) {
-                screen->driver->free_imported_bo(screen, bo);
-        }
-}
-
-void
-panfrost_bo_reference(struct panfrost_bo *bo)
-{
-        pipe_reference(NULL, &bo->reference);
-}
-
-void
-panfrost_bo_unreference(struct pipe_screen *screen, struct panfrost_bo *bo)
-{
-        /* When the reference count goes to zero, we need to cleanup */
-
-        if (pipe_reference(&bo->reference, NULL)) {
-                panfrost_destroy_bo(pan_screen(screen), bo);
-        }
-}
-
 static void
 panfrost_resource_destroy(struct pipe_screen *screen,
                           struct pipe_resource *pt)
@@ -385,14 +545,14 @@ panfrost_resource_destroy(struct pipe_screen *screen,
         struct panfrost_screen *pscreen = pan_screen(screen);
         struct panfrost_resource *rsrc = (struct panfrost_resource *) pt;
 
-       if (rsrc->scanout)
-               renderonly_scanout_destroy(rsrc->scanout, pscreen->ro);
+        if (rsrc->scanout)
+                renderonly_scanout_destroy(rsrc->scanout, pscreen->ro);
 
-       if (rsrc->bo)
-                panfrost_bo_unreference(screen, rsrc->bo);
+        if (rsrc->bo)
+                panfrost_bo_unreference(rsrc->bo);
 
         util_range_destroy(&rsrc->valid_buffer_range);
-       FREE(rsrc);
+        ralloc_free(rsrc);
 }
 
 static void *
@@ -407,7 +567,7 @@ panfrost_transfer_map(struct pipe_context *pctx,
         struct panfrost_resource *rsrc = pan_resource(resource);
         struct panfrost_bo *bo = rsrc->bo;
 
-        struct panfrost_gtransfer *transfer = CALLOC_STRUCT(panfrost_gtransfer);
+        struct panfrost_gtransfer *transfer = rzalloc(pctx, struct panfrost_gtransfer);
         transfer->base.level = level;
         transfer->base.usage = usage;
         transfer->base.box = *box;
@@ -416,36 +576,82 @@ panfrost_transfer_map(struct pipe_context *pctx,
 
         *out_transfer = &transfer->base;
 
-        if (resource->bind & PIPE_BIND_DISPLAY_TARGET ||
-            resource->bind & PIPE_BIND_SCANOUT ||
-            resource->bind & PIPE_BIND_SHARED) {
-                /* Mipmapped readpixels?! */
-                assert(level == 0);
+        /* If we haven't already mmaped, now's the time */
+        panfrost_bo_mmap(bo);
 
-                /* Force a flush -- kill the pipeline */
-                panfrost_flush(pctx, NULL, PIPE_FLUSH_END_OF_FRAME);
+        /* Check if we're bound for rendering and this is a read pixels. If so,
+         * we need to flush */
+
+        struct panfrost_context *ctx = pan_context(pctx);
+        struct pipe_framebuffer_state *fb = &ctx->pipe_framebuffer;
+
+        bool is_bound = false;
+
+        for (unsigned c = 0; c < fb->nr_cbufs; ++c) {
+                /* If cbufs is NULL, we're definitely not bound here */
+
+                if (fb->cbufs[c])
+                        is_bound |= fb->cbufs[c]->texture == resource;
         }
 
+        if (is_bound && (usage & PIPE_TRANSFER_READ))
+                 assert(level == 0);
+
+        /* TODO: Respect usage flags */
+
         if (usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE) {
-                /* TODO: reallocate */
-                //printf("debug: Missed reallocate\n");
+                /* If the BO is used by one of the pending batches or if it's
+                 * not ready yet (still accessed by one of the already flushed
+                 * batches), we try to allocate a new one to avoid waiting.
+                 */
+                if (panfrost_pending_batches_access_bo(ctx, bo) ||
+                    !panfrost_bo_wait(bo, 0, PAN_BO_ACCESS_RW)) {
+                        struct panfrost_screen *screen = pan_screen(pctx->screen);
+                        /* We want the BO to be MMAPed. */
+                        uint32_t flags = bo->flags & ~PAN_BO_DELAY_MMAP;
+                        struct panfrost_bo *newbo = NULL;
+
+                        /* When the BO has been imported/exported, we can't
+                         * replace it by another one, otherwise the
+                         * importer/exporter wouldn't see the change we're
+                         * doing to it.
+                         */
+                        if (!(bo->flags & (PAN_BO_IMPORTED | PAN_BO_EXPORTED)))
+                                newbo = panfrost_bo_create(screen, bo->size,
+                                                           flags);
+
+                        if (newbo) {
+                                panfrost_bo_unreference(bo);
+                                rsrc->bo = newbo;
+                                bo = newbo;
+                        } else {
+                                uint32_t access = PAN_BO_ACCESS_RW;
+
+                                /* Allocation failed or was impossible, let's
+                                 * fall back on a flush+wait.
+                                 */
+                                panfrost_flush_batches_accessing_bo(ctx, bo,
+                                                                    access);
+                                panfrost_bo_wait(bo, INT64_MAX, access);
+                        }
+                }
         } else if ((usage & PIPE_TRANSFER_WRITE)
-                        && resource->target == PIPE_BUFFER
-                        && !util_ranges_intersect(&rsrc->valid_buffer_range, box->x, box->x + box->width)) {
+                   && resource->target == PIPE_BUFFER
+                   && !util_ranges_intersect(&rsrc->valid_buffer_range, box->x, box->x + box->width)) {
                 /* No flush for writes to uninitialized */
         } else if (!(usage & PIPE_TRANSFER_UNSYNCHRONIZED)) {
                 if (usage & PIPE_TRANSFER_WRITE) {
-                        /* STUB: flush reading */
-                        //printf("debug: missed reading flush %d\n", resource->target);
+                        panfrost_flush_batches_accessing_bo(ctx, bo, PAN_BO_ACCESS_RW);
+                        panfrost_bo_wait(bo, INT64_MAX, PAN_BO_ACCESS_RW);
                 } else if (usage & PIPE_TRANSFER_READ) {
-                        /* STUB: flush writing */
-                        //printf("debug: missed writing flush %d (%d-%d)\n", resource->target, box->x, box->x + box->width);
+                        panfrost_flush_batches_accessing_bo(ctx, bo, PAN_BO_ACCESS_WRITE);
+                        panfrost_bo_wait(bo, INT64_MAX, PAN_BO_ACCESS_WRITE);
                 } else {
                         /* Why are you even mapping?! */
                 }
         }
 
-        if (bo->layout != PAN_LINEAR) {
+        if (rsrc->layout != PAN_LINEAR) {
                 /* Non-linear resources need to be indirectly mapped */
 
                 if (usage & PIPE_TRANSFER_MAP_DIRECTLY)
@@ -453,156 +659,240 @@ panfrost_transfer_map(struct pipe_context *pctx,
 
                 transfer->base.stride = box->width * bytes_per_pixel;
                 transfer->base.layer_stride = transfer->base.stride * box->height;
-
-                /* TODO: Reads */
-                transfer->map = malloc(transfer->base.layer_stride * box->depth);
+                transfer->map = rzalloc_size(transfer, transfer->base.layer_stride * box->depth);
+                assert(box->depth == 1);
+
+                if ((usage & PIPE_TRANSFER_READ) && rsrc->slices[level].initialized) {
+                        if (rsrc->layout == PAN_AFBC) {
+                                DBG("Unimplemented: reads from AFBC");
+                        } else if (rsrc->layout == PAN_TILED) {
+                                panfrost_load_tiled_image(
+                                        transfer->map,
+                                        bo->cpu + rsrc->slices[level].offset,
+                                        box->x, box->y, box->width, box->height,
+                                        transfer->base.stride,
+                                        rsrc->slices[level].stride,
+                                        resource->format);
+                        }
+                }
 
                 return transfer->map;
         } else {
-                transfer->base.stride = bo->slices[level].stride;
-                transfer->base.layer_stride = bo->cubemap_stride;
+                transfer->base.stride = rsrc->slices[level].stride;
+                if (resource->target == PIPE_TEXTURE_3D)
+                        transfer->base.layer_stride = rsrc->slices[level].size0;
+                else
+                        transfer->base.layer_stride = rsrc->cubemap_stride;
+
+                /* By mapping direct-write, we're implicitly already
+                 * initialized (maybe), so be conservative */
+
+                if ((usage & PIPE_TRANSFER_WRITE) && (usage & PIPE_TRANSFER_MAP_DIRECTLY))
+                        rsrc->slices[level].initialized = true;
 
                 return bo->cpu
-                        + bo->slices[level].offset
-                        + transfer->base.box.z * bo->cubemap_stride
-                        + transfer->base.box.y * bo->slices[level].stride
-                        + transfer->base.box.x * bytes_per_pixel;
+                       + rsrc->slices[level].offset
+                       + transfer->base.box.z * transfer->base.layer_stride
+                       + transfer->base.box.y * rsrc->slices[level].stride
+                       + transfer->base.box.x * bytes_per_pixel;
         }
 }
 
-static void
-panfrost_tile_texture(struct panfrost_screen *screen, struct panfrost_resource *rsrc, struct panfrost_gtransfer *trans)
-{
-       struct panfrost_bo *bo = (struct panfrost_bo *)rsrc->bo;
-
-        unsigned level = trans->base.level;
-
-        panfrost_texture_swizzle(
-                        trans->base.box.x,
-                        trans->base.box.y,
-                        trans->base.box.width,
-                        trans->base.box.height,
-                        util_format_get_blocksize(rsrc->base.format),
-                        u_minify(rsrc->base.width0, level),
-                        trans->map,
-                        bo->cpu
-                                + bo->slices[level].offset
-                                + bo->cubemap_stride * trans->base.box.z
-                        );
-}
-
 static void
 panfrost_transfer_unmap(struct pipe_context *pctx,
                         struct pipe_transfer *transfer)
 {
-        struct panfrost_context *ctx = pan_context(pctx);
-
         /* Gallium expects writeback here, so we tile */
 
         struct panfrost_gtransfer *trans = pan_transfer(transfer);
         struct panfrost_resource *prsrc = (struct panfrost_resource *) transfer->resource;
 
+        /* Mark whatever we wrote as written */
+        if (transfer->usage & PIPE_TRANSFER_WRITE)
+                prsrc->slices[transfer->level].initialized = true;
+
         if (trans->map) {
                 struct panfrost_bo *bo = prsrc->bo;
 
                 if (transfer->usage & PIPE_TRANSFER_WRITE) {
-
-                        if (bo->layout == PAN_AFBC) {
+                        if (prsrc->layout == PAN_AFBC) {
                                 DBG("Unimplemented: writes to AFBC\n");
-                        } else if (bo->layout == PAN_TILED) {
-                                struct pipe_context *gallium = (struct pipe_context *) ctx;
-                                struct panfrost_screen *screen = pan_screen(gallium->screen);
+                        } else if (prsrc->layout == PAN_TILED) {
                                 assert(transfer->box.depth == 1);
-                                panfrost_tile_texture(screen, prsrc, trans);
+
+                                panfrost_store_tiled_image(
+                                        bo->cpu + prsrc->slices[transfer->level].offset,
+                                        trans->map,
+                                        transfer->box.x, transfer->box.y,
+                                        transfer->box.width, transfer->box.height,
+                                        prsrc->slices[transfer->level].stride,
+                                        transfer->stride,
+                                        prsrc->base.format);
                         }
                 }
-
-                free(trans->map);
         }
 
 
-       util_range_add(&prsrc->valid_buffer_range,
-                        transfer->box.x,
-                        transfer->box.x + transfer->box.width);
+        util_range_add(&prsrc->base, &prsrc->valid_buffer_range,
+                       transfer->box.x,
+                       transfer->box.x + transfer->box.width);
 
         /* Derefence the resource */
         pipe_resource_reference(&transfer->resource, NULL);
 
-        /* Transfer itself is CALLOCed at the moment */
-        free(transfer);
+        /* Transfer itself is RALLOCed at the moment */
+        ralloc_free(transfer);
 }
 
 static void
 panfrost_transfer_flush_region(struct pipe_context *pctx,
-               struct pipe_transfer *transfer,
-               const struct pipe_box *box)
+                               struct pipe_transfer *transfer,
+                               const struct pipe_box *box)
 {
-       struct panfrost_resource *rsc = pan_resource(transfer->resource);
+        struct panfrost_resource *rsc = pan_resource(transfer->resource);
 
-       if (transfer->resource->target == PIPE_BUFFER) {
-               util_range_add(&rsc->valid_buffer_range,
-                                          transfer->box.x + box->x,
-                                          transfer->box.x + box->x + box->width);
+        if (transfer->resource->target == PIPE_BUFFER) {
+                util_range_add(&rsc->base, &rsc->valid_buffer_range,
+                               transfer->box.x + box->x,
+                               transfer->box.x + box->x + box->width);
+        } else {
+                unsigned level = transfer->level;
+                rsc->slices[level].initialized = true;
         }
 }
 
-static struct pb_slab *
-panfrost_slab_alloc(void *priv, unsigned heap, unsigned entry_size, unsigned group_index)
+static void
+panfrost_invalidate_resource(struct pipe_context *pctx, struct pipe_resource *prsc)
 {
-        struct panfrost_screen *screen = (struct panfrost_screen *) priv;
-        struct panfrost_memory *mem = CALLOC_STRUCT(panfrost_memory);
+        //DBG("TODO %s\n", __func__);
+}
 
-        size_t slab_size = (1 << (MAX_SLAB_ENTRY_SIZE + 1));
+static enum pipe_format
+panfrost_resource_get_internal_format(struct pipe_resource *rsrc) {
+        struct panfrost_resource *prsrc = (struct panfrost_resource *) rsrc;
+        return prsrc->internal_format;
+}
 
-        mem->slab.num_entries = slab_size / entry_size;
-        mem->slab.num_free = mem->slab.num_entries;
+static bool
+panfrost_generate_mipmap(
+        struct pipe_context *pctx,
+        struct pipe_resource *prsrc,
+        enum pipe_format format,
+        unsigned base_level,
+        unsigned last_level,
+        unsigned first_layer,
+        unsigned last_layer)
+{
+        struct panfrost_context *ctx = pan_context(pctx);
+        struct panfrost_resource *rsrc = pan_resource(prsrc);
 
-        LIST_INITHEAD(&mem->slab.free);
-        for (unsigned i = 0; i < mem->slab.num_entries; ++i) {
-                /* Create a slab entry */
-                struct panfrost_memory_entry *entry = CALLOC_STRUCT(panfrost_memory_entry);
-                entry->offset = entry_size * i;
+        /* Generating a mipmap invalidates the written levels, so make that
+         * explicit so we don't try to wallpaper them back and end up with
+         * u_blitter recursion */
 
-                entry->base.slab = &mem->slab;
-                entry->base.group_index = group_index;
+        assert(rsrc->bo);
+        for (unsigned l = base_level + 1; l <= last_level; ++l)
+                rsrc->slices[l].initialized = false;
 
-                LIST_ADDTAIL(&entry->base.head, &mem->slab.free);
-        }
+        /* Beyond that, we just delegate the hard stuff. We're careful to
+         * include flushes on both ends to make sure the data is really valid.
+         * We could be doing a lot better perf-wise, especially once we have
+         * reorder-type optimizations in place. But for now prioritize
+         * correctness. */
 
-        /* Actually allocate the memory from kernel-space. Mapped, same_va, no
-         * special flags */
+        panfrost_flush_batches_accessing_bo(ctx, rsrc->bo, PAN_BO_ACCESS_RW);
+        panfrost_bo_wait(rsrc->bo, INT64_MAX, PAN_BO_ACCESS_RW);
 
-        screen->driver->allocate_slab(screen, mem, slab_size / 4096, true, 0, 0, 0);
+        /* We've flushed the original buffer if needed, now trigger a blit */
 
-        return &mem->slab;
-}
+        bool blit_res = util_gen_mipmap(
+                                pctx, prsrc, format,
+                                base_level, last_level,
+                                first_layer, last_layer,
+                                PIPE_TEX_FILTER_LINEAR);
 
-static bool
-panfrost_slab_can_reclaim(void *priv, struct pb_slab_entry *entry)
-{
-        struct panfrost_memory_entry *p_entry = (struct panfrost_memory_entry *) entry;
-        return p_entry->freed;
-}
+        /* If the blit was successful, flush once more. If it wasn't, well, let
+         * the state tracker deal with it. */
 
-static void
-panfrost_slab_free(void *priv, struct pb_slab *slab)
-{
-        struct panfrost_memory *mem = (struct panfrost_memory *) slab;
-        struct panfrost_screen *screen = (struct panfrost_screen *) priv;
+        if (blit_res) {
+                panfrost_flush_batches_accessing_bo(ctx, rsrc->bo, PAN_BO_ACCESS_WRITE);
+                panfrost_bo_wait(rsrc->bo, INT64_MAX, PAN_BO_ACCESS_WRITE);
+        }
 
-        screen->driver->free_slab(screen, mem);
+        return blit_res;
 }
 
-static void
-panfrost_invalidate_resource(struct pipe_context *pctx, struct pipe_resource *prsc)
+/* Computes the address to a texture at a particular slice */
+
+mali_ptr
+panfrost_get_texture_address(
+        struct panfrost_resource *rsrc,
+        unsigned level, unsigned face)
 {
-        //DBG("TODO %s\n", __func__);
+        unsigned level_offset = rsrc->slices[level].offset;
+        unsigned face_offset = face * rsrc->cubemap_stride;
+
+        return rsrc->bo->gpu + level_offset + face_offset;
 }
 
-static enum pipe_format
-panfrost_resource_get_internal_format(struct pipe_resource *prsrc)
+/* Given a resource that has already been allocated, hint that it should use a
+ * given layout. These are suggestions, not commands; it is perfectly legal to
+ * stub out this function, but there will be performance implications. */
+
+void
+panfrost_resource_hint_layout(
+                struct panfrost_screen *screen,
+                struct panfrost_resource *rsrc,
+                enum panfrost_memory_layout layout,
+                signed weight)
 {
-        return prsrc->format;
+        /* Nothing to do, although a sophisticated implementation might store
+         * the hint */
+
+        if (rsrc->layout == layout)
+                return;
+
+        /* We don't use the weight yet, but we should check that it's positive
+         * (semantically meaning that we should choose the given `layout`) */
+
+        if (weight <= 0)
+                return;
+
+        /* Check if the preferred layout is legal for this buffer */
+
+        if (layout == PAN_AFBC) {
+                bool can_afbc = panfrost_format_supports_afbc(rsrc->base.format);
+                bool is_scanout = rsrc->base.bind &
+                        (PIPE_BIND_DISPLAY_TARGET | PIPE_BIND_SCANOUT | PIPE_BIND_SHARED);
+
+                if (!can_afbc || is_scanout)
+                        return;
+        }
+
+        /* Simple heuristic so far: if the resource is uninitialized, switch to
+         * the hinted layout. If it is initialized, keep the original layout.
+         * This misses some cases where it would be beneficial to switch and
+         * blit. */
+
+        bool is_initialized = false;
+
+        for (unsigned i = 0; i < MAX_MIP_LEVELS; ++i)
+                is_initialized |= rsrc->slices[i].initialized;
+
+        if (is_initialized)
+                return;
+
+        /* We're uninitialized, so do a layout switch. Reinitialize slices. */
+
+        size_t new_size;
+        rsrc->layout = layout;
+        panfrost_setup_slices(rsrc, &new_size);
+
+        /* If we grew in size, reallocate the BO */
+        if (new_size > rsrc->bo->size) {
+                panfrost_bo_unreference(rsrc->bo);
+                rsrc->bo = panfrost_bo_create(screen, new_size, PAN_BO_DELAY_MMAP);
+        }
 }
 
 static void
@@ -639,33 +929,20 @@ panfrost_resource_screen_init(struct panfrost_screen *pscreen)
         pscreen->base.resource_from_handle = panfrost_resource_from_handle;
         pscreen->base.resource_get_handle = panfrost_resource_get_handle;
         pscreen->base.transfer_helper = u_transfer_helper_create(&transfer_vtbl,
-                                                            true, false,
-                                                            true, true);
-
-        pb_slabs_init(&pscreen->slabs,
-                        MIN_SLAB_ENTRY_SIZE,
-                        MAX_SLAB_ENTRY_SIZE,
-
-                        3, /* Number of heaps */
-
-                        pscreen,
-
-                        panfrost_slab_can_reclaim,
-                        panfrost_slab_alloc,
-                        panfrost_slab_free);
+                                        true, false,
+                                        true, true);
 }
 
 void
 panfrost_resource_context_init(struct pipe_context *pctx)
 {
         pctx->transfer_map = u_transfer_helper_transfer_map;
-        pctx->transfer_flush_region = u_transfer_helper_transfer_flush_region;
         pctx->transfer_unmap = u_transfer_helper_transfer_unmap;
-        pctx->buffer_subdata = u_default_buffer_subdata;
         pctx->create_surface = panfrost_create_surface;
         pctx->surface_destroy = panfrost_surface_destroy;
         pctx->resource_copy_region = util_resource_copy_region;
         pctx->blit = panfrost_blit;
+        pctx->generate_mipmap = panfrost_generate_mipmap;
         pctx->flush_resource = panfrost_flush_resource;
         pctx->invalidate_resource = panfrost_invalidate_resource;
         pctx->transfer_flush_region = u_transfer_helper_transfer_flush_region;