* Rob Clark <robclark@freedesktop.org>
*/
+#include "drm-uapi/drm_fourcc.h"
+
#include "fd6_resource.h"
#include "fd6_format.h"
* it can be tiled doesn't mean it can be compressed.
*/
static bool
-ok_ubwc_format(enum pipe_format pfmt)
+ok_ubwc_format(struct fd_resource *rsc, enum pipe_format pfmt)
{
/* NOTE: both x24s8 and z24s8 map to RB6_X8Z24_UNORM, but UBWC
* does not seem to work properly when sampling x24s8.. possibly
if (pfmt == PIPE_FORMAT_X24S8_UINT)
return false;
+ /* We don't fully understand what's going wrong with this combination, but
+ * we haven't been able to make it work. It's enough of a corner-case
+ * that we can just disable UBWC for these resources.
+ */
+ if (rsc->base.target != PIPE_TEXTURE_2D &&
+ pfmt == PIPE_FORMAT_Z24_UNORM_S8_UINT)
+ return false;
+
switch (fd6_pipe2color(pfmt)) {
- case RB6_R10G10B10A2_UINT:
- case RB6_R10G10B10A2_UNORM:
- case RB6_R11G11B10_FLOAT:
- case RB6_R16_FLOAT:
- case RB6_R16G16B16A16_FLOAT:
- case RB6_R16G16B16A16_SINT:
- case RB6_R16G16B16A16_UINT:
- case RB6_R16G16_FLOAT:
- case RB6_R16G16_SINT:
- case RB6_R16G16_UINT:
- case RB6_R16_SINT:
- case RB6_R16_UINT:
- case RB6_R32G32B32A32_SINT:
- case RB6_R32G32B32A32_UINT:
- case RB6_R32G32_SINT:
- case RB6_R32G32_UINT:
- case RB6_R5G6B5_UNORM:
- case RB6_R8G8B8A8_SINT:
- case RB6_R8G8B8A8_UINT:
- case RB6_R8G8B8A8_UNORM:
- case RB6_R8G8B8X8_UNORM:
- case RB6_R8G8_SINT:
- case RB6_R8G8_UINT:
- case RB6_R8G8_UNORM:
- case RB6_Z24_UNORM_S8_UINT:
- case RB6_Z24_UNORM_S8_UINT_AS_R8G8B8A8:
+ case FMT6_10_10_10_2_UINT:
+ case FMT6_10_10_10_2_UNORM_DEST:
+ case FMT6_11_11_10_FLOAT:
+ case FMT6_16_FLOAT:
+ case FMT6_16_16_16_16_FLOAT:
+ case FMT6_16_16_16_16_SINT:
+ case FMT6_16_16_16_16_UINT:
+ case FMT6_16_16_FLOAT:
+ case FMT6_16_16_SINT:
+ case FMT6_16_16_UINT:
+ case FMT6_16_SINT:
+ case FMT6_16_UINT:
+ case FMT6_32_32_32_32_SINT:
+ case FMT6_32_32_32_32_UINT:
+ case FMT6_32_32_SINT:
+ case FMT6_32_32_UINT:
+ case FMT6_5_6_5_UNORM:
+ case FMT6_8_8_8_8_SINT:
+ case FMT6_8_8_8_8_UINT:
+ case FMT6_8_8_8_8_UNORM:
+ case FMT6_8_8_8_X8_UNORM:
+ case FMT6_8_8_SINT:
+ case FMT6_8_8_UINT:
+ case FMT6_8_8_UNORM:
+ case FMT6_Z24_UNORM_S8_UINT:
+ case FMT6_Z24_UNORM_S8_UINT_AS_R8G8B8A8:
return true;
default:
return false;
}
}
-uint32_t
-fd6_fill_ubwc_buffer_sizes(struct fd_resource *rsc)
-{
-#define RBG_TILE_WIDTH_ALIGNMENT 64
-#define RGB_TILE_HEIGHT_ALIGNMENT 16
-#define UBWC_PLANE_SIZE_ALIGNMENT 4096
-
- struct pipe_resource *prsc = &rsc->base;
- uint32_t width = prsc->width0;
- uint32_t height = prsc->height0;
-
- if (!ok_ubwc_format(prsc->format))
- return 0;
-
- /* limit things to simple single level 2d for now: */
- if ((prsc->depth0 != 1) || (prsc->array_size != 1) || (prsc->last_level != 0))
- return 0;
-
- uint32_t block_width, block_height;
- switch (rsc->layout.cpp) {
- case 2:
- case 4:
- block_width = 16;
- block_height = 4;
- break;
- case 8:
- block_width = 8;
- block_height = 4;
- break;
- case 16:
- block_width = 4;
- block_height = 4;
- break;
- default:
- return 0;
- }
-
- uint32_t meta_stride =
- ALIGN_POT(DIV_ROUND_UP(width, block_width), RBG_TILE_WIDTH_ALIGNMENT);
- uint32_t meta_height =
- ALIGN_POT(DIV_ROUND_UP(height, block_height), RGB_TILE_HEIGHT_ALIGNMENT);
- uint32_t meta_size =
- ALIGN_POT(meta_stride * meta_height, UBWC_PLANE_SIZE_ALIGNMENT);
-
- /* UBWC goes first, then color data.. this constraint is mainly only
- * because it is what the kernel expects for scanout. For non-2D we
- * could just use a separate UBWC buffer..
- */
- for (int level = 0; level <= prsc->last_level; level++) {
- struct fdl_slice *slice = fd_resource_slice(rsc, level);
- slice->offset += meta_size;
- }
-
- rsc->layout.ubwc_slices[0].offset = 0;
- rsc->layout.ubwc_slices[0].pitch = meta_stride;
- rsc->layout.ubwc_layer_size = meta_size;
- rsc->layout.tile_mode = TILE6_3;
-
- return meta_size;
-}
-
/**
* Ensure the rsc is in an ok state to be used with the specified format.
* This handles the case of UBWC buffers used with non-UBWC compatible
fd6_validate_format(struct fd_context *ctx, struct fd_resource *rsc,
enum pipe_format format)
{
- if (!rsc->layout.ubwc_layer_size)
+ if (!rsc->layout.ubwc)
return;
- if (ok_ubwc_format(format))
+ if (ok_ubwc_format(rsc, format))
return;
fd_resource_uncompress(ctx, rsc);
rsc->lrz = fd_bo_new(screen->dev, size, flags, "lrz");
}
-uint32_t
+static uint32_t
fd6_setup_slices(struct fd_resource *rsc)
{
struct pipe_resource *prsc = &rsc->base;
if (!(fd_mesa_debug & FD_DBG_NOLRZ) && has_depth(rsc->base.format))
setup_lrz(rsc);
+ if (rsc->layout.ubwc && !ok_ubwc_format(rsc, rsc->base.format))
+ rsc->layout.ubwc = false;
+
fdl6_layout(&rsc->layout, prsc->format, fd_resource_nr_samples(prsc),
prsc->width0, prsc->height0, prsc->depth0,
prsc->last_level + 1, prsc->array_size,
- prsc->target == PIPE_TEXTURE_3D, false);
+ prsc->target == PIPE_TEXTURE_3D);
+
+ return rsc->layout.size;
+}
+
+static int
+fill_ubwc_buffer_sizes(struct fd_resource *rsc)
+{
+ struct pipe_resource *prsc = &rsc->base;
+ struct fdl_slice slice = *fd_resource_slice(rsc, 0);
+
+ /* limit things to simple single level 2d for now: */
+ if ((prsc->depth0 != 1) || (prsc->array_size != 1) || (prsc->last_level != 0))
+ return -1;
+ if (prsc->target != PIPE_TEXTURE_2D)
+ return -1;
+ if (!ok_ubwc_format(rsc, prsc->format))
+ return -1;
+
+ rsc->layout.ubwc = true;
+ rsc->layout.tile_mode = TILE6_3;
+
+ fdl6_layout(&rsc->layout, prsc->format, fd_resource_nr_samples(prsc),
+ prsc->width0, prsc->height0, prsc->depth0,
+ prsc->last_level + 1, prsc->array_size, false);
+
+ if (fd_resource_slice(rsc, 0)->pitch != slice.pitch)
+ return -1;
+
+ /* The imported buffer may specify an offset, add that in here. */
+ rsc->layout.slices[0].offset += slice.offset;
+ rsc->layout.ubwc_slices[0].offset += slice.offset;
+ rsc->layout.size += slice.offset;
+
+ if (rsc->layout.size > fd_bo_size(rsc->bo))
+ return -1;
+
+ return 0;
+}
+
+static int
+fd6_layout_resource_for_modifier(struct fd_resource *rsc, uint64_t modifier)
+{
+ switch (modifier) {
+ case DRM_FORMAT_MOD_QCOM_COMPRESSED:
+ return fill_ubwc_buffer_sizes(rsc);
+ case DRM_FORMAT_MOD_LINEAR:
+ case DRM_FORMAT_MOD_INVALID:
+ return 0;
+ default:
+ return -1;
+ }
+}
+
+static const uint64_t supported_modifiers[] = {
+ DRM_FORMAT_MOD_LINEAR,
+ DRM_FORMAT_MOD_QCOM_COMPRESSED,
+};
+
+void
+fd6_resource_screen_init(struct pipe_screen *pscreen)
+{
+ struct fd_screen *screen = fd_screen(pscreen);
- /* The caller does this bit of layout setup again. */
- if (rsc->layout.layer_first)
- return rsc->layout.size / prsc->array_size;
- else
- return rsc->layout.size;
+ screen->setup_slices = fd6_setup_slices;
+ screen->layout_resource_for_modifier = fd6_layout_resource_for_modifier;
+ screen->supported_modifiers = supported_modifiers;
+ screen->num_supported_modifiers = ARRAY_SIZE(supported_modifiers);
}
projects / mesa.git / blobdiff