freedreno/layout: add explicit offset/pitch argument to fdl6_layout

[mesa.git] / src / gallium / drivers / freedreno / a6xx / fd6_resource.c

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_resource.c b/src/gallium/drivers/freedreno/a6xx/fd6_resource.c
index 2e86632892ab20cb46a6f753315b8e1886cacf96..c3e349395797ee7733007eb6a09f8a331ed508ed 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_resource.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_resource.c
@@ -25,6 +25,8 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
+#include "drm-uapi/drm_fourcc.h"
+
 #include "fd6_resource.h"
 #include "fd6_format.h"
 
@@ -57,32 +59,33 @@ ok_ubwc_format(struct fd_resource *rsc, enum pipe_format pfmt)
                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_8_UNORM:
+       case FMT6_Z24_UNORM_S8_UINT:
+       case FMT6_Z24_UNORM_S8_UINT_AS_R8G8B8A8:
                return true;
        default:
                return false;
@@ -136,7 +139,7 @@ setup_lrz(struct fd_resource *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;
@@ -150,7 +153,66 @@ fd6_setup_slices(struct fd_resource *rsc)
        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);
+                       prsc->target == PIPE_TEXTURE_3D,
+                       NULL);
 
        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;
+
+       if (!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, &slice))
+               return -1;
+
+       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);
+
+       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);
+}