Mesa (main): broadcom/common: move v3d_tiling to common
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jun 4 11:15:15 UTC 2021
Module: Mesa
Branch: main
Commit: d198e26a1ebc32c43e5bef10dcf0f8cc3234301d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d198e26a1ebc32c43e5bef10dcf0f8cc3234301d
Author: Alejandro Piñeiro <apinheiro at igalia.com>
Date: Tue Jun 1 14:33:06 2021 +0200
broadcom/common: move v3d_tiling to common
We initially just copied on v3dv, just in case we needed to modify
it. One year later the code is exactly the same, so let's move it to
common.
This fix an additional issue, as we were not using NEON when building
v3d_tiling.c for v3dv.
v2:
* Add "#include util/u_box.h" at v3d_tiling.h, so we can't avoid
the need to include it on other places. (Juan and Iago)
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11121>
---
.../drivers/v3d => broadcom/common}/v3d_tiling.c | 2 -
.../drivers/v3d => broadcom/common}/v3d_tiling.h | 39 ++
src/broadcom/meson.build | 19 +
src/broadcom/vulkan/meson.build | 1 -
src/broadcom/vulkan/v3d_tiling.c | 498 ---------------------
src/broadcom/vulkan/v3dv_private.h | 50 +--
src/gallium/drivers/v3d/meson.build | 14 +-
src/gallium/drivers/v3d/v3d_blit.c | 2 +-
src/gallium/drivers/v3d/v3d_resource.c | 1 -
src/gallium/drivers/v3d/v3d_resource.h | 37 +-
src/gallium/drivers/v3d/v3dx_rcl.c | 2 +-
src/gallium/drivers/v3d/v3dx_state.c | 2 +-
12 files changed, 64 insertions(+), 603 deletions(-)
diff --git a/src/gallium/drivers/v3d/v3d_tiling.c b/src/broadcom/common/v3d_tiling.c
similarity index 99%
rename from src/gallium/drivers/v3d/v3d_tiling.c
rename to src/broadcom/common/v3d_tiling.c
index 5870c98cb80..22f84811e19 100644
--- a/src/gallium/drivers/v3d/v3d_tiling.c
+++ b/src/broadcom/common/v3d_tiling.c
@@ -28,8 +28,6 @@
*/
#include <stdint.h>
-#include "v3d_screen.h"
-#include "v3d_context.h"
#include "v3d_tiling.h"
#include "broadcom/common/v3d_cpu_tiling.h"
diff --git a/src/gallium/drivers/v3d/v3d_tiling.h b/src/broadcom/common/v3d_tiling.h
similarity index 60%
rename from src/gallium/drivers/v3d/v3d_tiling.h
rename to src/broadcom/common/v3d_tiling.h
index 214380c537a..08ae7cce805 100644
--- a/src/gallium/drivers/v3d/v3d_tiling.h
+++ b/src/broadcom/common/v3d_tiling.h
@@ -24,6 +24,45 @@
#ifndef V3D_TILING_H
#define V3D_TILING_H
+#include "util/u_box.h"
+
+/* A UIFblock is a 256-byte region of memory that's 256-byte aligned. These
+ * will be grouped in 4x4 blocks (left-to-right, then top-to-bottom) in a 4KB
+ * page. Those pages are then arranged left-to-right, top-to-bottom, to cover
+ * an image.
+ *
+ * The inside of a UIFblock, for packed pixels, will be split into 4 64-byte
+ * utiles. Utiles may be 8x8 (8bpp), 8x4(16bpp) or 4x4 (32bpp).
+ */
+
+/**
+ * Tiling mode enum used for v3d_resource.c, which maps directly to the Memory
+ * Format field of render target and Z/Stencil config.
+ */
+enum v3d_tiling_mode {
+ /* Untiled resources. Not valid as texture inputs. */
+ V3D_TILING_RASTER,
+
+ /* Single line of u-tiles. */
+ V3D_TILING_LINEARTILE,
+
+ /* Departure from standard 4-UIF block column format. */
+ V3D_TILING_UBLINEAR_1_COLUMN,
+
+ /* Departure from standard 4-UIF block column format. */
+ V3D_TILING_UBLINEAR_2_COLUMN,
+
+ /* Normal tiling format: grouped in 4x4 UIFblocks, each of which is
+ * split 2x2 into utiles.
+ */
+ V3D_TILING_UIF_NO_XOR,
+
+ /* Normal tiling format: grouped in 4x4 UIFblocks, each of which is
+ * split 2x2 into utiles.
+ */
+ V3D_TILING_UIF_XOR,
+};
+
uint32_t v3d_utile_width(int cpp) ATTRIBUTE_CONST;
uint32_t v3d_utile_height(int cpp) ATTRIBUTE_CONST;
bool v3d_size_is_lt(uint32_t width, uint32_t height, int cpp) ATTRIBUTE_CONST;
diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build
index 6b51a37e0b1..c14c702c8ee 100644
--- a/src/broadcom/meson.build
+++ b/src/broadcom/meson.build
@@ -50,6 +50,24 @@ foreach ver : v3d_versions
)
endforeach
+v3d_args = ['-DV3D_BUILD_NEON']
+
+v3d_neon_c_args = []
+if host_machine.cpu_family() == 'arm'
+ v3d_neon_c_args = '-mfpu=neon'
+endif
+
+libv3d_neon = static_library(
+ 'v3d_neon',
+ 'common/v3d_tiling.c',
+ include_directories : [
+ inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom,
+ ],
+ c_args : [v3d_args, v3d_neon_c_args],
+ gnu_symbol_visibility : 'hidden',
+ dependencies : [dep_v3dv3, dep_libdrm, dep_valgrind, idep_nir_headers],
+)
+
libbroadcom_v3d = static_library(
'libbroadcom_v3d',
[
@@ -60,6 +78,7 @@ libbroadcom_v3d = static_library(
c_args : [no_override_init_args],
gnu_symbol_visibility : 'hidden',
link_whole : v3d_libs + per_version_libs,
+ link_with: [libv3d_neon],
build_by_default : false,
dependencies: [dep_valgrind, dep_thread],
)
diff --git a/src/broadcom/vulkan/meson.build b/src/broadcom/vulkan/meson.build
index 90813980724..4b35c5b4cdd 100644
--- a/src/broadcom/vulkan/meson.build
+++ b/src/broadcom/vulkan/meson.build
@@ -51,7 +51,6 @@ libv3dv_files = files(
'v3dv_uniforms.c',
'v3dv_util.c',
'v3dv_wsi.c',
- 'v3d_tiling.c',
)
# The vulkan driver only supports version >= 42, which is the version present in
diff --git a/src/broadcom/vulkan/v3d_tiling.c b/src/broadcom/vulkan/v3d_tiling.c
deleted file mode 100644
index a5d3fe1e40e..00000000000
--- a/src/broadcom/vulkan/v3d_tiling.c
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- * Copyright © 2014-2017 Broadcom
- *
- * 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.
- */
-
-/** @file v3d_tiling.c
- *
- * Handles information about the V3D tiling formats, and loading and storing
- * from them.
- */
-
-#include <stdint.h>
-#include <string.h>
-
-#include "v3dv_private.h"
-
-#include "util/u_math.h"
-#include "util/u_box.h"
-
-#include "broadcom/common/v3d_cpu_tiling.h"
-
-/** Return the width in pixels of a 64-byte microtile. */
-uint32_t
-v3d_utile_width(int cpp)
-{
- switch (cpp) {
- case 1:
- case 2:
- return 8;
- case 4:
- case 8:
- return 4;
- case 16:
- return 2;
- default:
- unreachable("unknown cpp");
- }
-}
-
-/** Return the height in pixels of a 64-byte microtile. */
-uint32_t
-v3d_utile_height(int cpp)
-{
- switch (cpp) {
- case 1:
- return 8;
- case 2:
- case 4:
- return 4;
- case 8:
- case 16:
- return 2;
- default:
- unreachable("unknown cpp");
- }
-}
-
-/**
- * Returns the byte address for a given pixel within a utile.
- *
- * Utiles are 64b blocks of pixels in raster order, with 32bpp being a 4x4
- * arrangement.
- */
-static inline uint32_t
-v3d_get_utile_pixel_offset(uint32_t cpp, uint32_t x, uint32_t y)
-{
- uint32_t utile_w = v3d_utile_width(cpp);
-
- assert(x < utile_w && y < v3d_utile_height(cpp));
-
- return x * cpp + y * utile_w * cpp;
-}
-
-/**
- * Returns the byte offset for a given pixel in a LINEARTILE layout.
- *
- * LINEARTILE is a single line of utiles in either the X or Y direction.
- */
-static inline uint32_t
-v3d_get_lt_pixel_offset(uint32_t cpp, uint32_t image_h, uint32_t x, uint32_t y)
-{
- uint32_t utile_w = v3d_utile_width(cpp);
- uint32_t utile_h = v3d_utile_height(cpp);
- uint32_t utile_index_x = x / utile_w;
- uint32_t utile_index_y = y / utile_h;
-
- assert(utile_index_x == 0 || utile_index_y == 0);
-
- return (64 * (utile_index_x + utile_index_y) +
- v3d_get_utile_pixel_offset(cpp,
- x & (utile_w - 1),
- y & (utile_h - 1)));
-}
-
-/**
- * Returns the byte offset for a given pixel in a UBLINEAR layout.
- *
- * UBLINEAR is the layout where pixels are arranged in UIF blocks (2x2
- * utiles), and the UIF blocks are in 1 or 2 columns in raster order.
- */
-static inline uint32_t
-v3d_get_ublinear_pixel_offset(uint32_t cpp, uint32_t x, uint32_t y,
- int ublinear_number)
-{
- uint32_t utile_w = v3d_utile_width(cpp);
- uint32_t utile_h = v3d_utile_height(cpp);
- uint32_t ub_w = utile_w * 2;
- uint32_t ub_h = utile_h * 2;
- uint32_t ub_x = x / ub_w;
- uint32_t ub_y = y / ub_h;
-
- return (256 * (ub_y * ublinear_number +
- ub_x) +
- ((x & utile_w) ? 64 : 0) +
- ((y & utile_h) ? 128 : 0) +
- + v3d_get_utile_pixel_offset(cpp,
- x & (utile_w - 1),
- y & (utile_h - 1)));
-}
-
-static inline uint32_t
-v3d_get_ublinear_2_column_pixel_offset(uint32_t cpp, uint32_t image_h,
- uint32_t x, uint32_t y)
-{
- return v3d_get_ublinear_pixel_offset(cpp, x, y, 2);
-}
-
-static inline uint32_t
-v3d_get_ublinear_1_column_pixel_offset(uint32_t cpp, uint32_t image_h,
- uint32_t x, uint32_t y)
-{
- return v3d_get_ublinear_pixel_offset(cpp, x, y, 1);
-}
-
-/**
- * Returns the byte offset for a given pixel in a UIF layout.
- *
- * UIF is the general V3D tiling layout shared across 3D, media, and scanout.
- * It stores pixels in UIF blocks (2x2 utiles), and UIF blocks are stored in
- * 4x4 groups, and those 4x4 groups are then stored in raster order.
- */
-static inline uint32_t
-v3d_get_uif_pixel_offset(uint32_t cpp, uint32_t image_h, uint32_t x, uint32_t y,
- bool do_xor)
-{
- uint32_t utile_w = v3d_utile_width(cpp);
- uint32_t utile_h = v3d_utile_height(cpp);
- uint32_t mb_width = utile_w * 2;
- uint32_t mb_height = utile_h * 2;
- uint32_t log2_mb_width = ffs(mb_width) - 1;
- uint32_t log2_mb_height = ffs(mb_height) - 1;
-
- /* Macroblock X, y */
- uint32_t mb_x = x >> log2_mb_width;
- uint32_t mb_y = y >> log2_mb_height;
- /* X, y within the macroblock */
- uint32_t mb_pixel_x = x - (mb_x << log2_mb_width);
- uint32_t mb_pixel_y = y - (mb_y << log2_mb_height);
-
- if (do_xor && (mb_x / 4) & 1)
- mb_y ^= 0x10;
-
- uint32_t mb_h = align(image_h, 1 << log2_mb_height) >> log2_mb_height;
- uint32_t mb_id = ((mb_x / 4) * ((mb_h - 1) * 4)) + mb_x + mb_y * 4;
-
- uint32_t mb_base_addr = mb_id * 256;
-
- bool top = mb_pixel_y < utile_h;
- bool left = mb_pixel_x < utile_w;
-
- /* Docs have this in pixels, we do bytes here. */
- uint32_t mb_tile_offset = (!top * 128 + !left * 64);
-
- uint32_t utile_x = mb_pixel_x & (utile_w - 1);
- uint32_t utile_y = mb_pixel_y & (utile_h - 1);
-
- uint32_t mb_pixel_address = (mb_base_addr +
- mb_tile_offset +
- v3d_get_utile_pixel_offset(cpp,
- utile_x,
- utile_y));
-
- return mb_pixel_address;
-}
-
-static inline uint32_t
-v3d_get_uif_xor_pixel_offset(uint32_t cpp, uint32_t image_h,
- uint32_t x, uint32_t y)
-{
- return v3d_get_uif_pixel_offset(cpp, image_h, x, y, true);
-}
-
-static inline uint32_t
-v3d_get_uif_no_xor_pixel_offset(uint32_t cpp, uint32_t image_h,
- uint32_t x, uint32_t y)
-{
- return v3d_get_uif_pixel_offset(cpp, image_h, x, y, false);
-}
-
-/* Loads/stores non-utile-aligned boxes by walking over the destination
- * rectangle, computing the address on the GPU, and storing/loading a pixel at
- * a time.
- */
-static inline void
-v3d_move_pixels_unaligned(void *gpu, uint32_t gpu_stride,
- void *cpu, uint32_t cpu_stride,
- int cpp, uint32_t image_h,
- const struct pipe_box *box,
- uint32_t (*get_pixel_offset)(uint32_t cpp,
- uint32_t image_h,
- uint32_t x, uint32_t y),
- bool is_load)
-{
- for (uint32_t y = 0; y < box->height; y++) {
- void *cpu_row = cpu + y * cpu_stride;
-
- for (int x = 0; x < box->width; x++) {
- uint32_t pixel_offset = get_pixel_offset(cpp, image_h,
- box->x + x,
- box->y + y);
-
- if (false) {
- fprintf(stderr, "%3d,%3d -> %d\n",
- box->x + x, box->y + y,
- pixel_offset);
- }
-
- if (is_load) {
- memcpy(cpu_row + x * cpp,
- gpu + pixel_offset,
- cpp);
- } else {
- memcpy(gpu + pixel_offset,
- cpu_row + x * cpp,
- cpp);
- }
- }
- }
-}
-
-/* Breaks the image down into utiles and calls either the fast whole-utile
- * load/store functions, or the unaligned fallback case.
- */
-static inline void
-v3d_move_pixels_general_percpp(void *gpu, uint32_t gpu_stride,
- void *cpu, uint32_t cpu_stride,
- int cpp, uint32_t image_h,
- const struct pipe_box *box,
- uint32_t (*get_pixel_offset)(uint32_t cpp,
- uint32_t image_h,
- uint32_t x, uint32_t y),
- bool is_load)
-{
- uint32_t utile_w = v3d_utile_width(cpp);
- uint32_t utile_h = v3d_utile_height(cpp);
- uint32_t utile_gpu_stride = utile_w * cpp;
- uint32_t x1 = box->x;
- uint32_t y1 = box->y;
- uint32_t x2 = box->x + box->width;
- uint32_t y2 = box->y + box->height;
- uint32_t align_x1 = align(x1, utile_w);
- uint32_t align_y1 = align(y1, utile_h);
- uint32_t align_x2 = x2 & ~(utile_w - 1);
- uint32_t align_y2 = y2 & ~(utile_h - 1);
-
- /* Load/store all the whole utiles first. */
- for (uint32_t y = align_y1; y < align_y2; y += utile_h) {
- void *cpu_row = cpu + (y - box->y) * cpu_stride;
-
- for (uint32_t x = align_x1; x < align_x2; x += utile_w) {
- void *utile_gpu = (gpu +
- get_pixel_offset(cpp, image_h, x, y));
- void *utile_cpu = cpu_row + (x - box->x) * cpp;
-
- if (is_load) {
- v3d_load_utile(utile_cpu, cpu_stride,
- utile_gpu, utile_gpu_stride);
- } else {
- v3d_store_utile(utile_gpu, utile_gpu_stride,
- utile_cpu, cpu_stride);
- }
- }
- }
-
- /* If there were no aligned utiles in the middle, load/store the whole
- * thing unaligned.
- */
- if (align_y2 <= align_y1 ||
- align_x2 <= align_x1) {
- v3d_move_pixels_unaligned(gpu, gpu_stride,
- cpu, cpu_stride,
- cpp, image_h,
- box,
- get_pixel_offset, is_load);
- return;
- }
-
- /* Load/store the partial utiles. */
- struct pipe_box partial_boxes[4] = {
- /* Top */
- {
- .x = x1,
- .width = x2 - x1,
- .y = y1,
- .height = align_y1 - y1,
- },
- /* Bottom */
- {
- .x = x1,
- .width = x2 - x1,
- .y = align_y2,
- .height = y2 - align_y2,
- },
- /* Left */
- {
- .x = x1,
- .width = align_x1 - x1,
- .y = align_y1,
- .height = align_y2 - align_y1,
- },
- /* Right */
- {
- .x = align_x2,
- .width = x2 - align_x2,
- .y = align_y1,
- .height = align_y2 - align_y1,
- },
- };
- for (int i = 0; i < ARRAY_SIZE(partial_boxes); i++) {
- void *partial_cpu = (cpu +
- (partial_boxes[i].y - y1) * cpu_stride +
- (partial_boxes[i].x - x1) * cpp);
-
- v3d_move_pixels_unaligned(gpu, gpu_stride,
- partial_cpu, cpu_stride,
- cpp, image_h,
- &partial_boxes[i],
- get_pixel_offset, is_load);
- }
-}
-
-static inline void
-v3d_move_pixels_general(void *gpu, uint32_t gpu_stride,
- void *cpu, uint32_t cpu_stride,
- int cpp, uint32_t image_h,
- const struct pipe_box *box,
- uint32_t (*get_pixel_offset)(uint32_t cpp,
- uint32_t image_h,
- uint32_t x, uint32_t y),
- bool is_load)
-{
- switch (cpp) {
- case 1:
- v3d_move_pixels_general_percpp(gpu, gpu_stride,
- cpu, cpu_stride,
- 1, image_h, box,
- get_pixel_offset,
- is_load);
- break;
- case 2:
- v3d_move_pixels_general_percpp(gpu, gpu_stride,
- cpu, cpu_stride,
- 2, image_h, box,
- get_pixel_offset,
- is_load);
- break;
- case 4:
- v3d_move_pixels_general_percpp(gpu, gpu_stride,
- cpu, cpu_stride,
- 4, image_h, box,
- get_pixel_offset,
- is_load);
- break;
- case 8:
- v3d_move_pixels_general_percpp(gpu, gpu_stride,
- cpu, cpu_stride,
- 8, image_h, box,
- get_pixel_offset,
- is_load);
- break;
- case 16:
- v3d_move_pixels_general_percpp(gpu, gpu_stride,
- cpu, cpu_stride,
- 16, image_h, box,
- get_pixel_offset,
- is_load);
- break;
- }
-}
-
-static inline void
-v3d_move_tiled_image(void *gpu, uint32_t gpu_stride,
- void *cpu, uint32_t cpu_stride,
- enum v3d_tiling_mode tiling_format,
- int cpp,
- uint32_t image_h,
- const struct pipe_box *box,
- bool is_load)
-{
- switch (tiling_format) {
- case V3D_TILING_UIF_XOR:
- v3d_move_pixels_general(gpu, gpu_stride,
- cpu, cpu_stride,
- cpp, image_h, box,
- v3d_get_uif_xor_pixel_offset,
- is_load);
- break;
- case V3D_TILING_UIF_NO_XOR:
- v3d_move_pixels_general(gpu, gpu_stride,
- cpu, cpu_stride,
- cpp, image_h, box,
- v3d_get_uif_no_xor_pixel_offset,
- is_load);
- break;
- case V3D_TILING_UBLINEAR_2_COLUMN:
- v3d_move_pixels_general(gpu, gpu_stride,
- cpu, cpu_stride,
- cpp, image_h, box,
- v3d_get_ublinear_2_column_pixel_offset,
- is_load);
- break;
- case V3D_TILING_UBLINEAR_1_COLUMN:
- v3d_move_pixels_general(gpu, gpu_stride,
- cpu, cpu_stride,
- cpp, image_h, box,
- v3d_get_ublinear_1_column_pixel_offset,
- is_load);
- break;
- case V3D_TILING_LINEARTILE:
- v3d_move_pixels_general(gpu, gpu_stride,
- cpu, cpu_stride,
- cpp, image_h, box,
- v3d_get_lt_pixel_offset,
- is_load);
- break;
- default:
- unreachable("Unsupported tiling format");
- break;
- }
-}
-
-/**
- * Loads pixel data from the start (microtile-aligned) box in \p src to the
- * start of \p dst according to the given tiling format.
- */
-void
-v3d_load_tiled_image(void *dst, uint32_t dst_stride,
- void *src, uint32_t src_stride,
- enum v3d_tiling_mode tiling_format, int cpp,
- uint32_t image_h,
- const struct pipe_box *box)
-{
- v3d_move_tiled_image(src, src_stride,
- dst, dst_stride,
- tiling_format,
- cpp,
- image_h,
- box,
- true);
-}
-
-/**
- * Stores pixel data from the start of \p src into a (microtile-aligned) box in
- * \p dst according to the given tiling format.
- */
-void
-v3d_store_tiled_image(void *dst, uint32_t dst_stride,
- void *src, uint32_t src_stride,
- enum v3d_tiling_mode tiling_format, int cpp,
- uint32_t image_h,
- const struct pipe_box *box)
-{
- v3d_move_tiled_image(dst, dst_stride,
- src, src_stride,
- tiling_format,
- cpp,
- image_h,
- box,
- false);
-}
diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h
index a01238ec1e4..7d689409502 100644
--- a/src/broadcom/vulkan/v3dv_private.h
+++ b/src/broadcom/vulkan/v3dv_private.h
@@ -56,6 +56,7 @@
#include "common/v3d_device_info.h"
#include "common/v3d_limits.h"
+#include "common/v3d_tiling.h"
#include "common/v3d_util.h"
#include "compiler/shader_enums.h"
@@ -89,12 +90,6 @@ pack_emit_reloc(void *cl, const void *reloc) {}
#include "vk_alloc.h"
#include "simulator/v3d_simulator.h"
-
-/* FIXME: pipe_box from Gallium. Needed for some v3d_tiling.c functions.
- * In the future we might want to drop that depedency, but for now it is
- * good enough.
- */
-#include "util/u_box.h"
#include "wsi_common.h"
#include "broadcom/cle/v3dx_pack.h"
@@ -457,34 +452,6 @@ struct v3dv_format {
bool supports_filtering;
};
-/**
- * Tiling mode enum used for v3d_resource.c, which maps directly to the Memory
- * Format field of render target and Z/Stencil config.
- */
-enum v3d_tiling_mode {
- /* Untiled resources. Not valid as texture inputs. */
- V3D_TILING_RASTER,
-
- /* Single line of u-tiles. */
- V3D_TILING_LINEARTILE,
-
- /* Departure from standard 4-UIF block column format. */
- V3D_TILING_UBLINEAR_1_COLUMN,
-
- /* Departure from standard 4-UIF block column format. */
- V3D_TILING_UBLINEAR_2_COLUMN,
-
- /* Normal tiling format: grouped in 4x4 UIFblocks, each of which is
- * split 2x2 into utiles.
- */
- V3D_TILING_UIF_NO_XOR,
-
- /* Normal tiling format: grouped in 4x4 UIFblocks, each of which is
- * split 2x2 into utiles.
- */
- V3D_TILING_UIF_XOR,
-};
-
struct v3d_resource_slice {
uint32_t offset;
uint32_t stride;
@@ -1898,21 +1865,6 @@ bool v3dv_buffer_format_supports_features(VkFormat vk_format,
VkFormatFeatureFlags features);
bool v3dv_format_supports_tlb_resolve(const struct v3dv_format *format);
-uint32_t v3d_utile_width(int cpp);
-uint32_t v3d_utile_height(int cpp);
-
-void v3d_load_tiled_image(void *dst, uint32_t dst_stride,
- void *src, uint32_t src_stride,
- enum v3d_tiling_mode tiling_format,
- int cpp, uint32_t image_h,
- const struct pipe_box *box);
-
-void v3d_store_tiled_image(void *dst, uint32_t dst_stride,
- void *src, uint32_t src_stride,
- enum v3d_tiling_mode tiling_format,
- int cpp, uint32_t image_h,
- const struct pipe_box *box);
-
struct v3dv_cl_reloc v3dv_write_uniforms(struct v3dv_cmd_buffer *cmd_buffer,
struct v3dv_pipeline *pipeline,
struct v3dv_shader_variant *variant);
diff --git a/src/gallium/drivers/v3d/meson.build b/src/gallium/drivers/v3d/meson.build
index 033ff402321..32c512dbca7 100644
--- a/src/gallium/drivers/v3d/meson.build
+++ b/src/gallium/drivers/v3d/meson.build
@@ -77,18 +77,6 @@ if host_machine.cpu_family() == 'arm'
v3d_neon_c_args = '-mfpu=neon'
endif
-libv3d_neon = static_library(
- 'v3d_neon',
- 'v3d_tiling.c',
- include_directories : [
- inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom,
- inc_gallium_drivers,
- ],
- c_args : [v3d_args, v3d_neon_c_args],
- gnu_symbol_visibility : 'hidden',
- dependencies : [dep_v3dv3, dep_libdrm, dep_valgrind, idep_nir_headers],
-)
-
libv3d = static_library(
'v3d',
[
@@ -103,7 +91,7 @@ libv3d = static_library(
cpp_args : [v3d_args],
gnu_symbol_visibility : 'hidden',
dependencies : [dep_v3dv3, dep_libdrm, dep_valgrind, idep_nir_headers],
- link_with: [per_version_libs, libv3d_neon],
+ link_with: [per_version_libs],
)
driver_v3d = declare_dependency(
diff --git a/src/gallium/drivers/v3d/v3d_blit.c b/src/gallium/drivers/v3d/v3d_blit.c
index 7b19b39e6ae..8ebc42b7d3c 100644
--- a/src/gallium/drivers/v3d/v3d_blit.c
+++ b/src/gallium/drivers/v3d/v3d_blit.c
@@ -26,7 +26,7 @@
#include "util/u_blitter.h"
#include "compiler/nir/nir_builder.h"
#include "v3d_context.h"
-#include "v3d_tiling.h"
+#include "broadcom/common/v3d_tiling.h"
void
v3d_blitter_save(struct v3d_context *v3d)
diff --git a/src/gallium/drivers/v3d/v3d_resource.c b/src/gallium/drivers/v3d/v3d_resource.c
index 412e92cbdb1..96dfcddf69d 100644
--- a/src/gallium/drivers/v3d/v3d_resource.c
+++ b/src/gallium/drivers/v3d/v3d_resource.c
@@ -36,7 +36,6 @@
#include "v3d_screen.h"
#include "v3d_context.h"
#include "v3d_resource.h"
-#include "v3d_tiling.h"
#include "broadcom/cle/v3d_packet_v33_pack.h"
static void
diff --git a/src/gallium/drivers/v3d/v3d_resource.h b/src/gallium/drivers/v3d/v3d_resource.h
index a79676cc6c9..9533b3bf595 100644
--- a/src/gallium/drivers/v3d/v3d_resource.h
+++ b/src/gallium/drivers/v3d/v3d_resource.h
@@ -28,42 +28,7 @@
#include "v3d_screen.h"
#include "util/u_transfer.h"
-/* A UIFblock is a 256-byte region of memory that's 256-byte aligned. These
- * will be grouped in 4x4 blocks (left-to-right, then top-to-bottom) in a 4KB
- * page. Those pages are then arranged left-to-right, top-to-bottom, to cover
- * an image.
- *
- * The inside of a UIFblock, for packed pixels, will be split into 4 64-byte
- * utiles. Utiles may be 8x8 (8bpp), 8x4(16bpp) or 4x4 (32bpp).
- */
-
-/**
- * Tiling mode enum used for v3d_resource.c, which maps directly to the Memory
- * Format field of render target and Z/Stencil config.
- */
-enum v3d_tiling_mode {
- /* Untiled resources. Not valid as texture inputs. */
- V3D_TILING_RASTER,
-
- /* Single line of u-tiles. */
- V3D_TILING_LINEARTILE,
-
- /* Departure from standard 4-UIF block column format. */
- V3D_TILING_UBLINEAR_1_COLUMN,
-
- /* Departure from standard 4-UIF block column format. */
- V3D_TILING_UBLINEAR_2_COLUMN,
-
- /* Normal tiling format: grouped in 4x4 UIFblocks, each of which is
- * split 2x2 into utiles.
- */
- V3D_TILING_UIF_NO_XOR,
-
- /* Normal tiling format: grouped in 4x4 UIFblocks, each of which is
- * split 2x2 into utiles.
- */
- V3D_TILING_UIF_XOR,
-};
+#include "broadcom/common/v3d_tiling.h"
struct v3d_transfer {
struct pipe_transfer base;
diff --git a/src/gallium/drivers/v3d/v3dx_rcl.c b/src/gallium/drivers/v3d/v3dx_rcl.c
index 36c927ce629..3acd56e7096 100644
--- a/src/gallium/drivers/v3d/v3dx_rcl.c
+++ b/src/gallium/drivers/v3d/v3dx_rcl.c
@@ -23,7 +23,7 @@
#include "util/format/u_format.h"
#include "v3d_context.h"
-#include "v3d_tiling.h"
+#include "broadcom/common/v3d_tiling.h"
#include "broadcom/common/v3d_macros.h"
#include "broadcom/cle/v3dx_pack.h"
diff --git a/src/gallium/drivers/v3d/v3dx_state.c b/src/gallium/drivers/v3d/v3dx_state.c
index 9dfa9e074f9..e9033d250d7 100644
--- a/src/gallium/drivers/v3d/v3dx_state.c
+++ b/src/gallium/drivers/v3d/v3dx_state.c
@@ -33,7 +33,7 @@
#include "util/u_upload_mgr.h"
#include "v3d_context.h"
-#include "v3d_tiling.h"
+#include "broadcom/common/v3d_tiling.h"
#include "broadcom/common/v3d_macros.h"
#include "broadcom/compiler/v3d_compiler.h"
#include "broadcom/cle/v3dx_pack.h"
More information about the mesa-commit
mailing list