Import Mesa 19.2.8

4 files changed, 172 insertions, 2 deletions

diff --git a/lib/mesa/src/gallium/drivers/freedreno/a3xx/fd3_resource.c b/lib/mesa/src/gallium/drivers/freedreno/a3xx/fd3_resource.c
new file mode 100644
index 000000000..5bde52c62
--- /dev/null
+++ b/lib/mesa/src/gallium/drivers/freedreno/a3xx/fd3_resource.c
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2012 Rob Clark <robclark@freedesktop.org>
+ * Copyright (C) 2019 Khaled Emara <ekhaled1836@gmail.com>
+ *
+ * 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, 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 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.
+ */
+
+#include "fd3_resource.h"
+#include "fd3_format.h"
+
+static uint32_t
+setup_slices(struct fd_resource *rsc, uint32_t alignment, enum pipe_format format)
+{
+	struct pipe_resource *prsc = &rsc->base;
+	struct fd_screen *screen = fd_screen(prsc->screen);
+	uint32_t pitchalign = screen->gmem_alignw;
+	uint32_t level, size = 0;
+	uint32_t width = prsc->width0;
+	uint32_t height = prsc->height0;
+	uint32_t depth = prsc->depth0;
+
+	for (level = 0; level <= prsc->last_level; level++) {
+		struct fd_resource_slice *slice = fd_resource_slice(rsc, level);
+		uint32_t blocks;
+
+		if (rsc->tile_mode) {
+			width = util_next_power_of_two(width);
+			height = util_next_power_of_two(height);
+			uint32_t tpitch = width * rsc->cpp;
+			slice->pitch = (tpitch > 32) ? tpitch : 32;
+		} else {
+			slice->pitch = width = align(width, pitchalign);
+		}
+
+		slice->offset = size;
+		blocks = util_format_get_nblocks(format, slice->pitch, height);
+		/* 1d array and 2d array textures must all have the same layer size
+		 * for each miplevel on a3xx. 3d textures can have different layer
+		 * sizes for high levels, but the hw auto-sizer is buggy (or at least
+		 * different than what this code does), so as soon as the layer size
+		 * range gets into range, we stop reducing it.
+		 */
+		if (prsc->target == PIPE_TEXTURE_3D && (
+					level == 1 ||
+					(level > 1 && rsc->slices[level - 1].size0 > 0xf000)))
+			slice->size0 = align(blocks * rsc->cpp, alignment);
+		else if (level == 0 || alignment == 1)
+			slice->size0 = align(blocks * rsc->cpp, alignment);
+		else
+			slice->size0 = rsc->slices[level - 1].size0;
+
+		size += slice->size0 * depth * prsc->array_size;
+
+		width = u_minify(width, 1);
+		height = u_minify(height, 1);
+		depth = u_minify(depth, 1);
+	}
+
+	return size;
+}
+
+uint32_t
+fd3_setup_slices(struct fd_resource *rsc)
+{
+	uint32_t alignment;
+
+	switch (rsc->base.target) {
+	case PIPE_TEXTURE_3D:
+	case PIPE_TEXTURE_1D_ARRAY:
+	case PIPE_TEXTURE_2D_ARRAY:
+		alignment = 4096;
+		break;
+	default:
+		alignment = 1;
+		break;
+	}
+
+	return setup_slices(rsc, alignment, rsc->base.format);
+}
+
+static bool
+ok_format(enum pipe_format pfmt, const struct pipe_resource * tmpl)
+{
+	enum a3xx_color_fmt fmt = fd3_pipe2color(pfmt);
+
+	if (fmt == ~0)
+		return false;
+
+	if (tmpl->target == PIPE_TEXTURE_CUBE)
+		return false;
+
+	switch (pfmt) {
+	case PIPE_FORMAT_R8_UINT:
+	case PIPE_FORMAT_R8_SINT:
+	case PIPE_FORMAT_Z32_FLOAT:
+		return false;
+	default:
+		break;
+	}
+
+	return true;
+}
+
+unsigned
+fd3_tile_mode(const struct pipe_resource *tmpl)
+{
+	if (ok_format(tmpl->format, tmpl))
+		return TILE_4X4;
+	return LINEAR;
+}
diff --git a/lib/mesa/src/gallium/drivers/freedreno/a3xx/fd3_resource.h b/lib/mesa/src/gallium/drivers/freedreno/a3xx/fd3_resource.h
new file mode 100644
index 000000000..dbfa52305
--- /dev/null
+++ b/lib/mesa/src/gallium/drivers/freedreno/a3xx/fd3_resource.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2012 Rob Clark <robclark@freedesktop.org>
+ * Copyright (C) 2019 Khaled Emara <ekhaled1836@gmail.com>
+ *
+ * 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, 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 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.
+ */
+
+#ifndef FD3_RESOURCE_H_
+#define FD3_RESOURCE_H_
+
+#include "pipe/p_state.h"
+
+#include "freedreno_resource.h"
+
+uint32_t fd3_setup_slices(struct fd_resource *rsc);
+unsigned fd3_tile_mode(const struct pipe_resource *tmpl);
+
+#endif /* FD3_RESOURCE_H_ */
diff --git a/lib/mesa/src/gallium/drivers/freedreno/a3xx/fd3_screen.c b/lib/mesa/src/gallium/drivers/freedreno/a3xx/fd3_screen.c
index 7ed57d2de..1c059104b 100644
--- a/lib/mesa/src/gallium/drivers/freedreno/a3xx/fd3_screen.c
+++ b/lib/mesa/src/gallium/drivers/freedreno/a3xx/fd3_screen.c
@@ -30,10 +30,12 @@
 #include "fd3_screen.h"
 #include "fd3_context.h"
 #include "fd3_format.h"
+#include "fd3_emit.h"
+#include "fd3_resource.h"
 
 #include "ir3/ir3_compiler.h"
 
-static boolean
+static bool
 fd3_screen_is_format_supported(struct pipe_screen *pscreen,
 		enum pipe_format format,
 		enum pipe_texture_target target,
@@ -47,7 +49,7 @@ fd3_screen_is_format_supported(struct pipe_screen *pscreen,
 			(sample_count > 1)) { /* TODO add MSAA */
 		DBG("not supported: format=%s, target=%d, sample_count=%d, usage=%x",
 				util_format_name(format), target, sample_count, usage);
-		return FALSE;
+		return false;
 	}
 
 	if (MAX2(1, sample_count) != MAX2(1, storage_sample_count))
@@ -106,4 +108,9 @@ fd3_screen_init(struct pipe_screen *pscreen)
 	screen->compiler = ir3_compiler_create(screen->dev, screen->gpu_id);
 	pscreen->context_create = fd3_context_create;
 	pscreen->is_format_supported = fd3_screen_is_format_supported;
+	fd3_emit_init_screen(pscreen);
+
+	screen->setup_slices = fd3_setup_slices;
+	if (fd_mesa_debug & FD_DBG_TTILE)
+		screen->tile_mode = fd3_tile_mode;
 }
diff --git a/lib/mesa/src/gallium/drivers/freedreno/a3xx/fd3_texture.c b/lib/mesa/src/gallium/drivers/freedreno/a3xx/fd3_texture.c
index f5000adfe..068486d8b 100644
--- a/lib/mesa/src/gallium/drivers/freedreno/a3xx/fd3_texture.c
+++ b/lib/mesa/src/gallium/drivers/freedreno/a3xx/fd3_texture.c
@@ -227,6 +227,7 @@ fd3_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
 	so->base.context = pctx;
 
 	so->texconst0 =
+	 		A3XX_TEX_CONST_0_TILE_MODE(rsc->tile_mode) |
 			A3XX_TEX_CONST_0_TYPE(tex_type(prsc->target)) |
 			A3XX_TEX_CONST_0_FMT(fd3_pipe2tex(cso->format)) |
 			fd3_tex_swiz(cso->format, cso->swizzle_r, cso->swizzle_g,