/*
* Copyright (C) 2008 VMware, Inc.
- * Copyright (C) 2014 Broadcom
+ * Copyright (C) 2012 Rob Clark <robclark@freedesktop.org>
+ * Copyright (C) 2014-2017 Broadcom
* Copyright (C) 2018-2019 Alyssa Rosenzweig
* Copyright (C) 2019 Collabora, Ltd.
*
#include "util/u_transfer.h"
#include "util/u_transfer_helper.h"
#include "util/u_gen_mipmap.h"
+#include "util/u_drm.h"
#include "pan_bo.h"
#include "pan_context.h"
#include "pan_resource.h"
#include "pan_util.h"
#include "pan_tiling.h"
-#include "pandecode/decode.h"
+#include "decode.h"
#include "panfrost-quirks.h"
-/* Wrapper around panfrost_bo_create that handles pandecode */
-
-struct panfrost_bo *
-pan_bo_create(struct panfrost_device *dev, size_t size, uint32_t flags)
-{
- struct panfrost_bo *bo = panfrost_bo_create(dev, size, flags);
-
- if (pan_debug & (PAN_DBG_TRACE | PAN_DBG_SYNC)) {
- if (flags & PAN_BO_INVISIBLE)
- pandecode_inject_mmap(bo->gpu, NULL, bo->size, NULL);
- else if (!(flags & PAN_BO_DELAY_MMAP))
- pandecode_inject_mmap(bo->gpu, bo->cpu, bo->size, NULL);
- }
-
- return bo;
-}
-
-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,
const struct pipe_resource *templat,
rsc->bo = panfrost_bo_import(dev, whandle->handle);
rsc->internal_format = templat->format;
- rsc->layout = MALI_TEXTURE_LINEAR;
+ rsc->modifier = (whandle->modifier == DRM_FORMAT_MOD_INVALID) ?
+ DRM_FORMAT_MOD_LINEAR : whandle->modifier;
rsc->slices[0].stride = whandle->stride;
rsc->slices[0].offset = whandle->offset;
rsc->slices[0].initialized = true;
- panfrost_resource_reset_damage(rsc);
+ panfrost_resource_set_damage_region(NULL, &rsc->base, 0, NULL);
if (dev->quirks & IS_BIFROST &&
templat->bind & PIPE_BIND_RENDER_TARGET) {
unsigned size = panfrost_compute_checksum_size(
&rsc->slices[0], templat->width0, templat->height0);
- rsc->slices[0].checksum_bo = pan_bo_create(dev, size, 0);
+ rsc->slices[0].checksum_bo = panfrost_bo_create(dev, size, 0);
rsc->checksummed = true;
}
+ if (drm_is_afbc(whandle->modifier)) {
+ rsc->slices[0].header_size =
+ panfrost_afbc_header_size(templat->width0, templat->height0);
+ }
+
if (dev->ro) {
rsc->scanout =
renderonly_create_gpu_import_for_resource(prsc, dev->ro, NULL);
struct panfrost_resource *rsrc = (struct panfrost_resource *) pt;
struct renderonly_scanout *scanout = rsrc->scanout;
- handle->modifier = DRM_FORMAT_MOD_INVALID;
+ handle->modifier = rsrc->modifier;
if (handle->type == WINSYS_HANDLE_TYPE_SHARED) {
return false;
static void
panfrost_flush_resource(struct pipe_context *pctx, struct pipe_resource *prsc)
{
- //DBG("TODO %s\n", __func__);
+ /* TODO */
}
static struct pipe_surface *
assert(surf_tmpl->u.tex.level <= pt->last_level);
ps->width = u_minify(pt->width0, surf_tmpl->u.tex.level);
ps->height = u_minify(pt->height0, surf_tmpl->u.tex.level);
+ ps->nr_samples = surf_tmpl->nr_samples;
ps->u.tex.level = surf_tmpl->u.tex.level;
ps->u.tex.first_layer = surf_tmpl->u.tex.first_layer;
ps->u.tex.last_layer = surf_tmpl->u.tex.last_layer;
static struct pipe_resource *
panfrost_create_scanout_res(struct pipe_screen *screen,
- const struct pipe_resource *template)
+ const struct pipe_resource *template,
+ uint64_t modifier)
{
struct panfrost_device *dev = pan_device(screen);
- struct pipe_resource scanout_templat = *template;
struct renderonly_scanout *scanout;
struct winsys_handle handle;
struct pipe_resource *res;
+ struct pipe_resource scanout_templat = *template;
+
+ /* Tiled formats need to be tile aligned */
+ if (modifier == DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED) {
+ scanout_templat.width0 = ALIGN_POT(template->width0, 16);
+ scanout_templat.height0 = ALIGN_POT(template->height0, 16);
+ }
+
+ /* AFBC formats need a header. Thankfully we don't care about the
+ * stride so we can just use wonky dimensions as long as the right
+ * number of bytes are allocated at the end of the day... this implies
+ * that stride/pitch is invalid for AFBC buffers */
+
+ if (drm_is_afbc(modifier)) {
+ /* Space for the header. We need to keep vaguely similar
+ * dimensions because... reasons... to allocate with renderonly
+ * as a dumb buffer. To do so, after the usual 16x16 alignment,
+ * we add on extra rows for the header. The order of operations
+ * matters here, the extra rows of padding can in fact be
+ * needed and missing them can lead to faults. */
+
+ unsigned header_size = panfrost_afbc_header_size(
+ template->width0, template->height0);
+
+ unsigned pitch = ALIGN_POT(template->width0, 16) *
+ util_format_get_blocksize(template->format);
+
+ unsigned header_rows =
+ DIV_ROUND_UP(header_size, pitch);
+
+ scanout_templat.width0 = ALIGN_POT(template->width0, 16);
+ scanout_templat.height0 = ALIGN_POT(template->height0, 16) + header_rows;
+ }
scanout = renderonly_scanout_for_resource(&scanout_templat,
dev->ro, &handle);
return NULL;
assert(handle.type == WINSYS_HANDLE_TYPE_FD);
- /* TODO: handle modifiers? */
+ handle.modifier = modifier;
res = screen->resource_from_handle(screen, template, &handle,
PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE);
close(handle.handle);
return res;
}
-/* Setup the mip tree given a particular layout, possibly with checksumming */
+/* Setup the mip tree given a particular modifier, possibly with checksumming */
static void
panfrost_setup_slices(struct panfrost_resource *pres, size_t *bo_size)
unsigned depth = res->depth0;
unsigned bytes_per_pixel = util_format_get_blocksize(pres->internal_format);
+ /* MSAA is implemented as a 3D texture with z corresponding to the
+ * sample #, horrifyingly enough */
+
+ bool msaa = res->nr_samples > 1;
+
+ if (msaa) {
+ assert(depth == 1);
+ depth = res->nr_samples;
+ }
+
assert(depth > 0);
/* Tiled operates blockwise; linear is packed. Also, anything
bool renderable = res->bind &
(PIPE_BIND_RENDER_TARGET | PIPE_BIND_DEPTH_STENCIL) &&
res->target != PIPE_BUFFER;
- bool afbc = pres->layout == MALI_TEXTURE_AFBC;
- bool tiled = pres->layout == MALI_TEXTURE_TILED;
- bool should_align = renderable || tiled;
+ bool afbc = drm_is_afbc(pres->modifier);
+ bool tiled = pres->modifier == DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED;
+ bool linear = pres->modifier == DRM_FORMAT_MOD_LINEAR;
+ bool should_align = renderable || tiled || afbc;
/* We don't know how to specify a 2D stride for 3D textures */
stride /= 4;
/* ..but cache-line align it for performance */
- if (can_align_stride && pres->layout == MALI_TEXTURE_LINEAR)
+ if (can_align_stride && linear)
stride = ALIGN_POT(stride, 64);
slice->stride = stride;
width = u_minify(width, 1);
height = u_minify(height, 1);
- depth = u_minify(depth, 1);
+
+ /* Don't mipmap the sample count */
+ if (!msaa)
+ depth = u_minify(depth, 1);
}
assert(res->array_size);
}
}
-static void
-panfrost_resource_create_bo(struct panfrost_device *dev, struct panfrost_resource *pres)
+/* Based on the usage, determine if it makes sense to use u-inteleaved tiling.
+ * We only have routines to tile 2D textures of sane bpps. On the hardware
+ * level, not all usages are valid for tiling. Finally, if the app is hinting
+ * that the contents frequently change, tiling will be a loss.
+ *
+ * Due to incomplete information on some platforms, we may need to force tiling
+ * in some cases.
+ *
+ * On platforms where it is supported, AFBC is even better. */
+
+static bool
+panfrost_can_linear(struct panfrost_device *dev, const struct panfrost_resource *pres)
{
- struct pipe_resource *res = &pres->base;
+ /* XXX: We should be able to do linear Z/S with the right bits.. */
+ return !((pres->base.bind & PIPE_BIND_DEPTH_STENCIL) &&
+ (dev->quirks & (MIDGARD_SFBD | IS_BIFROST)));
+}
+
+static bool
+panfrost_should_afbc(struct panfrost_device *dev, const struct panfrost_resource *pres)
+{
+ /* AFBC resources may be rendered to, textured from, or shared across
+ * processes, but may not be used as e.g buffers */
+ const unsigned valid_binding =
+ PIPE_BIND_DEPTH_STENCIL |
+ PIPE_BIND_RENDER_TARGET |
+ PIPE_BIND_BLENDABLE |
+ PIPE_BIND_SAMPLER_VIEW |
+ PIPE_BIND_DISPLAY_TARGET |
+ PIPE_BIND_SCANOUT |
+ PIPE_BIND_SHARED;
+
+ if (pres->base.bind & ~valid_binding)
+ return false;
+
+ /* AFBC introduced with Mali T760 */
+ if (dev->quirks & MIDGARD_NO_AFBC)
+ return false;
+
+ /* AFBC<-->staging is expensive */
+ if (pres->base.usage == PIPE_USAGE_STREAM)
+ return false;
+
+ /* Only a small selection of formats are AFBC'able */
+ if (!panfrost_format_supports_afbc(pres->internal_format))
+ return false;
+
+ /* AFBC does not support layered (GLES3 style) multisampling. Use
+ * EXT_multisampled_render_to_texture instead */
+ if (pres->base.nr_samples > 1)
+ return false;
+
+ /* TODO: Is AFBC of 3D textures possible? */
+ if ((pres->base.target != PIPE_TEXTURE_2D) && (pres->base.target != PIPE_TEXTURE_RECT))
+ return false;
- /* Based on the usage, figure out what storing will be used. There are
- * various tradeoffs:
- *
- * Linear: the basic format, bad for memory bandwidth, bad for cache
- * use. Zero-copy, though. Renderable.
- *
- * Tiled: Not compressed, but cache-optimized. Expensive to write into
- * (due to software tiling), but cheap to sample from. Ideal for most
- * 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.
- * Only a few types of resources can be tiled, ensure the bind is only
- * (a combination of) one of the following */
+ /* For one tile, AFBC is a loss compared to u-interleaved */
+ if (pres->base.width0 <= 16 && pres->base.height0 <= 16)
+ return false;
+
+ /* Otherwise, we'd prefer AFBC as it is dramatically more efficient
+ * than linear or usually even u-interleaved */
+ return true;
+}
+static bool
+panfrost_should_tile(struct panfrost_device *dev, const struct panfrost_resource *pres)
+{
const unsigned valid_binding =
PIPE_BIND_DEPTH_STENCIL |
PIPE_BIND_RENDER_TARGET |
PIPE_BIND_BLENDABLE |
PIPE_BIND_SAMPLER_VIEW |
- PIPE_BIND_DISPLAY_TARGET;
+ PIPE_BIND_DISPLAY_TARGET |
+ PIPE_BIND_SCANOUT |
+ PIPE_BIND_SHARED;
unsigned bpp = util_format_get_blocksizebits(pres->internal_format);
- bool is_2d = (res->target == PIPE_TEXTURE_2D) || (res->target == PIPE_TEXTURE_RECT);
- bool is_sane_bpp = bpp == 8 || bpp == 16 || bpp == 24 || bpp == 32 || bpp == 64 || bpp == 128;
- bool should_tile = (res->usage != PIPE_USAGE_STREAM);
- bool must_tile = (res->bind & PIPE_BIND_DEPTH_STENCIL) &&
- (dev->quirks & (MIDGARD_SFBD | IS_BIFROST));
- 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;
+ bool is_sane_bpp =
+ bpp == 8 || bpp == 16 || bpp == 24 || bpp == 32 ||
+ bpp == 64 || bpp == 128;
+
+ bool is_2d = (pres->base.target == PIPE_TEXTURE_2D)
+ || (pres->base.target == PIPE_TEXTURE_RECT);
+
+ bool can_tile = is_2d && is_sane_bpp && ((pres->base.bind & ~valid_binding) == 0);
+
+ if (!panfrost_can_linear(dev, pres)) {
+ assert(can_tile);
+ return true;
+ }
- pres->checksummed = can_checksum && should_checksum;
+ return can_tile && (pres->base.usage != PIPE_USAGE_STREAM);
+}
- /* Set the layout appropriately */
- assert(!(must_tile && !can_tile)); /* must_tile => can_tile */
- pres->layout = ((can_tile && should_tile) || must_tile) ? MALI_TEXTURE_TILED : MALI_TEXTURE_LINEAR;
- pres->layout_constant = must_tile || !can_tile;
+static uint64_t
+panfrost_best_modifier(struct panfrost_device *dev,
+ const struct panfrost_resource *pres)
+{
+ if (panfrost_should_afbc(dev, pres)) {
+ uint64_t afbc =
+ AFBC_FORMAT_MOD_BLOCK_SIZE_16x16 |
+ AFBC_FORMAT_MOD_SPARSE;
+
+ if (panfrost_afbc_can_ytr(pres->base.format))
+ afbc |= AFBC_FORMAT_MOD_YTR;
+
+ return DRM_FORMAT_MOD_ARM_AFBC(afbc);
+ } else if (panfrost_should_tile(dev, pres))
+ return DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED;
+ else
+ return DRM_FORMAT_MOD_LINEAR;
+}
+
+static void
+panfrost_resource_create_bo(struct panfrost_device *dev, struct panfrost_resource *pres,
+ uint64_t modifier)
+{
+ struct pipe_resource *res = &pres->base;
+
+ pres->modifier = (modifier != DRM_FORMAT_MOD_INVALID) ? modifier :
+ panfrost_best_modifier(dev, pres);
+ pres->checksummed = (res->bind & PIPE_BIND_RENDER_TARGET);
+
+ /* We can only switch tiled->linear if the resource isn't already
+ * linear, and if we control the modifier, and if the resource can be
+ * linear. */
+ pres->modifier_constant = !((pres->modifier != DRM_FORMAT_MOD_LINEAR)
+ && (modifier == DRM_FORMAT_INVALID)
+ && panfrost_can_linear(dev, pres));
size_t bo_size;
/* 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 = pan_bo_create(dev, bo_size, PAN_BO_DELAY_MMAP);
+ pres->bo = panfrost_bo_create(dev, bo_size, PAN_BO_DELAY_MMAP);
}
void
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;
- }
-
- /* 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
- */
+ if (pres->damage.inverted_rects)
+ ralloc_free(pres->damage.inverted_rects);
+
memset(&pres->damage, 0, sizeof(pres->damage));
+
+ pres->damage.inverted_rects =
+ pan_subtract_damage(pres,
+ res->width0, res->height0,
+ nrects, rects, &pres->damage.inverted_len);
+
+ /* Track the damage extent: the quad including all damage regions. Will
+ * be used restrict the rendering area */
+
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,
damage_extent->maxy = MAX2(damage_extent->maxy,
MIN2(y + h, res->height0));
}
+
+ if (nrects == 0) {
+ damage_extent->minx = 0;
+ damage_extent->miny = 0;
+ damage_extent->maxx = res->width0;
+ damage_extent->maxy = res->height0;
+ }
+
}
static struct pipe_resource *
-panfrost_resource_create(struct pipe_screen *screen,
- const struct pipe_resource *template)
+panfrost_resource_create_with_modifier(struct pipe_screen *screen,
+ const struct pipe_resource *template,
+ uint64_t modifier)
{
struct panfrost_device *dev = pan_device(screen);
case PIPE_TEXTURE_3D:
case PIPE_TEXTURE_CUBE:
case PIPE_TEXTURE_RECT:
+ case PIPE_TEXTURE_1D_ARRAY:
case PIPE_TEXTURE_2D_ARRAY:
break;
default:
- DBG("Unknown texture target %d\n", template->target);
- assert(0);
+ unreachable("Unknown texture target\n");
}
if (dev->ro && (template->bind &
(PIPE_BIND_DISPLAY_TARGET | PIPE_BIND_SCANOUT | PIPE_BIND_SHARED)))
- return panfrost_create_scanout_res(screen, template);
+ return panfrost_create_scanout_res(screen, template, modifier);
struct panfrost_resource *so = rzalloc(screen, struct panfrost_resource);
so->base = *template;
util_range_init(&so->valid_buffer_range);
- panfrost_resource_create_bo(dev, so);
- panfrost_resource_reset_damage(so);
+ panfrost_resource_create_bo(dev, so, modifier);
+ panfrost_resource_set_damage_region(NULL, &so->base, 0, NULL);
if (template->bind & PIPE_BIND_INDEX_BUFFER)
so->index_cache = rzalloc(so, struct panfrost_minmax_cache);
return (struct pipe_resource *)so;
}
+/* Default is to create a resource as don't care */
+
+static struct pipe_resource *
+panfrost_resource_create(struct pipe_screen *screen,
+ const struct pipe_resource *template)
+{
+ return panfrost_resource_create_with_modifier(screen, template,
+ DRM_FORMAT_MOD_INVALID);
+}
+
+/* If no modifier is specified, we'll choose. Otherwise, the order of
+ * preference is compressed, tiled, linear. */
+
+static struct pipe_resource *
+panfrost_resource_create_with_modifiers(struct pipe_screen *screen,
+ const struct pipe_resource *template,
+ const uint64_t *modifiers, int count)
+{
+ for (unsigned i = 0; i < PAN_MODIFIER_COUNT; ++i) {
+ if (drm_find_modifier(pan_best_modifiers[i], modifiers, count)) {
+ return panfrost_resource_create_with_modifier(screen, template,
+ pan_best_modifiers[i]);
+ }
+ }
+
+ /* If we didn't find one, app specified invalid */
+ assert(count == 1 && modifiers[0] == DRM_FORMAT_MOD_INVALID);
+ return panfrost_resource_create(screen, template);
+}
+
static void
panfrost_resource_destroy(struct pipe_screen *screen,
struct pipe_resource *pt)
ralloc_free(rsrc);
}
+/* Most of the time we can do CPU-side transfers, but sometimes we need to use
+ * the 3D pipe for this. Let's wrap u_blitter to blit to/from staging textures.
+ * Code adapted from freedreno */
+
+static struct panfrost_resource *
+pan_alloc_staging(struct panfrost_context *ctx, struct panfrost_resource *rsc,
+ unsigned level, const struct pipe_box *box)
+{
+ struct pipe_context *pctx = &ctx->base;
+ struct pipe_resource tmpl = rsc->base;
+
+ tmpl.width0 = box->width;
+ tmpl.height0 = box->height;
+ /* for array textures, box->depth is the array_size, otherwise
+ * for 3d textures, it is the depth:
+ */
+ if (tmpl.array_size > 1) {
+ if (tmpl.target == PIPE_TEXTURE_CUBE)
+ tmpl.target = PIPE_TEXTURE_2D_ARRAY;
+ tmpl.array_size = box->depth;
+ tmpl.depth0 = 1;
+ } else {
+ tmpl.array_size = 1;
+ tmpl.depth0 = box->depth;
+ }
+ tmpl.last_level = 0;
+ tmpl.bind |= PIPE_BIND_LINEAR;
+
+ struct pipe_resource *pstaging =
+ pctx->screen->resource_create(pctx->screen, &tmpl);
+ if (!pstaging)
+ return NULL;
+
+ return pan_resource(pstaging);
+}
+
+static void
+pan_blit_from_staging(struct pipe_context *pctx, struct panfrost_gtransfer *trans)
+{
+ struct pipe_resource *dst = trans->base.resource;
+ struct pipe_blit_info blit = {};
+
+ blit.dst.resource = dst;
+ blit.dst.format = dst->format;
+ blit.dst.level = trans->base.level;
+ blit.dst.box = trans->base.box;
+ blit.src.resource = trans->staging.rsrc;
+ blit.src.format = trans->staging.rsrc->format;
+ blit.src.level = 0;
+ blit.src.box = trans->staging.box;
+ blit.mask = util_format_get_mask(trans->staging.rsrc->format);
+ blit.filter = PIPE_TEX_FILTER_NEAREST;
+
+ panfrost_blit(pctx, &blit);
+}
+
+static void
+pan_blit_to_staging(struct pipe_context *pctx, struct panfrost_gtransfer *trans)
+{
+ struct pipe_resource *src = trans->base.resource;
+ struct pipe_blit_info blit = {};
+
+ blit.src.resource = src;
+ blit.src.format = src->format;
+ blit.src.level = trans->base.level;
+ blit.src.box = trans->base.box;
+ blit.dst.resource = trans->staging.rsrc;
+ blit.dst.format = trans->staging.rsrc->format;
+ blit.dst.level = 0;
+ blit.dst.box = trans->staging.box;
+ blit.mask = util_format_get_mask(trans->staging.rsrc->format);
+ blit.filter = PIPE_TEX_FILTER_NEAREST;
+
+ panfrost_blit(pctx, &blit);
+}
static void *
panfrost_transfer_map(struct pipe_context *pctx,
struct pipe_transfer **out_transfer)
{
struct panfrost_context *ctx = pan_context(pctx);
+ struct panfrost_device *dev = pan_device(pctx->screen);
struct panfrost_resource *rsrc = pan_resource(resource);
int bytes_per_pixel = util_format_get_blocksize(rsrc->internal_format);
struct panfrost_bo *bo = rsrc->bo;
+ /* Can't map tiled/compressed directly */
+ if ((usage & PIPE_TRANSFER_MAP_DIRECTLY) && rsrc->modifier != DRM_FORMAT_MOD_LINEAR)
+ return NULL;
+
struct panfrost_gtransfer *transfer = rzalloc(pctx, struct panfrost_gtransfer);
transfer->base.level = level;
transfer->base.usage = usage;
transfer->base.box = *box;
pipe_resource_reference(&transfer->base.resource, resource);
-
*out_transfer = &transfer->base;
+ /* We don't have s/w routines for AFBC, so use a staging texture */
+ if (drm_is_afbc(rsrc->modifier)) {
+ struct panfrost_resource *staging = pan_alloc_staging(ctx, rsrc, level, box);
+ transfer->base.stride = staging->slices[0].stride;
+ transfer->base.layer_stride = transfer->base.stride * box->height;
+
+ transfer->staging.rsrc = &staging->base;
+
+ transfer->staging.box = *box;
+ transfer->staging.box.x = 0;
+ transfer->staging.box.y = 0;
+ transfer->staging.box.z = 0;
+
+ assert(transfer->staging.rsrc != NULL);
+
+ /* TODO: Eliminate this flush. It's only there to determine if
+ * we're initialized or not, when the initialization could come
+ * from a pending batch XXX */
+ panfrost_flush_batches_accessing_bo(ctx, rsrc->bo, true);
+
+ if ((usage & PIPE_TRANSFER_READ) && rsrc->slices[level].initialized) {
+ pan_blit_to_staging(pctx, transfer);
+ panfrost_flush_batches_accessing_bo(ctx, staging->bo, true);
+ panfrost_bo_wait(staging->bo, INT64_MAX, false);
+ }
+
+ panfrost_bo_mmap(staging->bo);
+ return staging->bo->cpu;
+ }
+
/* If we haven't already mmaped, now's the time */
panfrost_bo_mmap(bo);
- if (pan_debug & (PAN_DBG_TRACE | PAN_DBG_SYNC))
+ if (dev->debug & (PAN_DBG_TRACE | PAN_DBG_SYNC))
pandecode_inject_mmap(bo->gpu, bo->cpu, bo->size, NULL);
bool create_new_bo = usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE;
!(usage & PIPE_TRANSFER_UNSYNCHRONIZED) &&
(usage & PIPE_TRANSFER_WRITE) &&
!(resource->target == PIPE_BUFFER
- && !util_ranges_intersect(&rsrc->valid_buffer_range, box->x, box->x + box->width))) {
+ && !util_ranges_intersect(&rsrc->valid_buffer_range, box->x, box->x + box->width)) &&
+ panfrost_pending_batches_access_bo(ctx, bo)) {
- /* It is often faster to copy the whole resource than to flush
- * readers */
+ /* When a resource to be modified is already being used by a
+ * pending batch, it is often faster to copy the whole BO than
+ * to flush and split the frame in two. This also mostly
+ * mitigates broken depth reload.
+ */
- panfrost_flush_batches_accessing_bo(ctx, bo, PAN_BO_ACCESS_WRITE);
- panfrost_bo_wait(bo, INT64_MAX, PAN_BO_ACCESS_WRITE);
+ panfrost_flush_batches_accessing_bo(ctx, bo, false);
+ panfrost_bo_wait(bo, INT64_MAX, false);
create_new_bo = true;
copy_resource = true;
* 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_device *dev = pan_device(pctx->screen);
+ !panfrost_bo_wait(bo, 0, true)) {
/* We want the BO to be MMAPed. */
uint32_t flags = bo->flags & ~PAN_BO_DELAY_MMAP;
struct panfrost_bo *newbo = NULL;
* importer/exporter wouldn't see the change we're
* doing to it.
*/
- if (!(bo->flags & (PAN_BO_IMPORTED | PAN_BO_EXPORTED)))
- newbo = pan_bo_create(dev, bo->size,
+ if (!(bo->flags & PAN_BO_SHARED))
+ newbo = panfrost_bo_create(dev, bo->size,
flags);
if (newbo) {
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);
+ panfrost_flush_batches_accessing_bo(ctx, bo, true);
+ panfrost_bo_wait(bo, INT64_MAX, true);
}
}
} else if ((usage & PIPE_TRANSFER_WRITE)
/* No flush for writes to uninitialized */
} else if (!(usage & PIPE_TRANSFER_UNSYNCHRONIZED)) {
if (usage & PIPE_TRANSFER_WRITE) {
- panfrost_flush_batches_accessing_bo(ctx, bo, PAN_BO_ACCESS_RW);
- panfrost_bo_wait(bo, INT64_MAX, PAN_BO_ACCESS_RW);
+ panfrost_flush_batches_accessing_bo(ctx, bo, true);
+ panfrost_bo_wait(bo, INT64_MAX, true);
} else if (usage & PIPE_TRANSFER_READ) {
- panfrost_flush_batches_accessing_bo(ctx, bo, PAN_BO_ACCESS_WRITE);
- panfrost_bo_wait(bo, INT64_MAX, PAN_BO_ACCESS_WRITE);
+ panfrost_flush_batches_accessing_bo(ctx, bo, false);
+ panfrost_bo_wait(bo, INT64_MAX, false);
}
}
- if (rsrc->layout != MALI_TEXTURE_LINEAR) {
- /* Non-linear resources need to be indirectly mapped */
-
- if (usage & PIPE_TRANSFER_MAP_DIRECTLY)
- return NULL;
-
+ if (rsrc->modifier == DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED) {
transfer->base.stride = box->width * bytes_per_pixel;
transfer->base.layer_stride = transfer->base.stride * box->height;
transfer->map = ralloc_size(transfer, transfer->base.layer_stride * box->depth);
assert(box->depth == 1);
if ((usage & PIPE_TRANSFER_READ) && rsrc->slices[level].initialized) {
- if (rsrc->layout == MALI_TEXTURE_AFBC) {
- DBG("Unimplemented: reads from AFBC");
- } else if (rsrc->layout == MALI_TEXTURE_TILED) {
- panfrost_load_tiled_image(
+ 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,
rsrc->internal_format);
- }
}
return transfer->map;
} else {
+ assert (rsrc->modifier == DRM_FORMAT_MOD_LINEAR);
+
/* Direct, persistent writes create holes in time for
* caching... I don't know if this is actually possible but we
* should still get it right */
/* By mapping direct-write, we're implicitly already
* initialized (maybe), so be conservative */
- if ((usage & PIPE_TRANSFER_WRITE) && (usage & PIPE_TRANSFER_MAP_DIRECTLY)) {
+ if (usage & PIPE_TRANSFER_WRITE) {
rsrc->slices[level].initialized = true;
panfrost_minmax_cache_invalidate(rsrc->index_cache, &transfer->base);
}
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;
+ /* AFBC will use a staging resource. `initialized` will be set when the
+ * fragment job is created; this is deferred to prevent useless surface
+ * reloads that can cascade into DATA_INVALID_FAULTs due to reading
+ * malformed AFBC data if uninitialized */
+ if (trans->staging.rsrc) {
+ if (transfer->usage & PIPE_TRANSFER_WRITE) {
+ pan_blit_from_staging(pctx, trans);
+ panfrost_flush_batches_accessing_bo(pan_context(pctx), pan_resource(trans->staging.rsrc)->bo, true);
+ }
+
+ pipe_resource_reference(&trans->staging.rsrc, NULL);
+ }
+
+ /* Tiling will occur in software from a staging cpu buffer */
if (trans->map) {
struct panfrost_bo *bo = prsrc->bo;
if (transfer->usage & PIPE_TRANSFER_WRITE) {
- if (prsrc->layout == MALI_TEXTURE_AFBC) {
- DBG("Unimplemented: writes to AFBC\n");
- } else if (prsrc->layout == MALI_TEXTURE_TILED) {
+ prsrc->slices[transfer->level].initialized = true;
+
+ if (prsrc->modifier == DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED) {
assert(transfer->box.depth == 1);
/* Do we overwrite the entire resource? If so,
* we don't need an intermediate blit so it's a
- * good time to switch the layout. */
+ * good time to switch the modifier. */
bool discards_content = prsrc->base.last_level == 0
&& transfer->box.width == prsrc->base.width0
&& transfer->box.height == prsrc->base.height0
&& transfer->box.x == 0
&& transfer->box.y == 0
- && !prsrc->layout_constant;
+ && !prsrc->modifier_constant;
/* It also serves as a good heuristic for
* streaming textures (e.g. in video players),
* but we could do better */
if (discards_content)
- ++prsrc->layout_updates;
+ ++prsrc->modifier_updates;
- if (prsrc->layout_updates >= LAYOUT_CONVERT_THRESHOLD)
+ if (prsrc->modifier_updates >= LAYOUT_CONVERT_THRESHOLD)
{
- prsrc->layout = MALI_TEXTURE_LINEAR;
+ prsrc->modifier = DRM_FORMAT_MOD_LINEAR;
util_copy_rect(
bo->cpu + prsrc->slices[0].offset,
static void
panfrost_invalidate_resource(struct pipe_context *pctx, struct pipe_resource *prsc)
{
- //DBG("TODO %s\n", __func__);
+ /* TODO */
}
static enum pipe_format
mali_ptr
panfrost_get_texture_address(
struct panfrost_resource *rsrc,
- unsigned level, unsigned face)
+ unsigned level, unsigned face, unsigned sample)
{
bool is_3d = rsrc->base.target == PIPE_TEXTURE_3D;
- return rsrc->bo->gpu + panfrost_texture_offset(rsrc->slices, is_3d, rsrc->cubemap_stride, level, face);
-}
-
-/* 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_device *dev,
- struct panfrost_resource *rsrc,
- enum mali_texture_layout layout,
- signed weight)
-{
- /* 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 == MALI_TEXTURE_AFBC) {
- bool can_afbc = panfrost_format_supports_afbc(rsrc->internal_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 = pan_bo_create(dev, new_size, PAN_BO_DELAY_MMAP);
- }
-
- /* TODO: If there are textures bound, regenerate their descriptors */
+ return rsrc->bo->gpu + panfrost_texture_offset(rsrc->slices, is_3d, rsrc->cubemap_stride, level, face, sample);
}
static void
void
panfrost_resource_screen_init(struct pipe_screen *pscreen)
{
- //pscreen->base.resource_create_with_modifiers =
- // panfrost_resource_create_with_modifiers;
+ struct panfrost_device *dev = pan_device(pscreen);
+
+ bool fake_rgtc = !panfrost_supports_compressed_format(dev, MALI_BC4_UNORM);
+
+ pscreen->resource_create_with_modifiers =
+ panfrost_resource_create_with_modifiers;
pscreen->resource_create = u_transfer_helper_resource_create;
pscreen->resource_destroy = u_transfer_helper_resource_destroy;
pscreen->resource_from_handle = panfrost_resource_from_handle;
pscreen->resource_get_handle = panfrost_resource_get_handle;
pscreen->transfer_helper = u_transfer_helper_create(&transfer_vtbl,
true, false,
- true, true);
+ fake_rgtc, true);
}
void