[igt-dev] [PATCH i-g-t v3 8/8] tests/gem_blits: Use intel_cmds_info library
Karolina Stolarek
karolina.stolarek at intel.com
Tue Mar 14 14:44:40 UTC 2023
Update the test to use blt_tiling_type values. Make it skip
if a copy command doesn't support a specific tiling format.
Signed-off-by: Karolina Stolarek <karolina.stolarek at intel.com>
Cc: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
---
lib/i915/i915_blt.c | 6 ++++
tests/i915/gem_blits.c | 66 +++++++++++++++++++++++++-----------------
2 files changed, 46 insertions(+), 26 deletions(-)
diff --git a/lib/i915/i915_blt.c b/lib/i915/i915_blt.c
index 13105820..ef67fe26 100644
--- a/lib/i915/i915_blt.c
+++ b/lib/i915/i915_blt.c
@@ -16,6 +16,12 @@
#define BITRANGE(start, end) (end - start + 1)
#define GET_CMDS_INFO(__fd) intel_get_cmds_info(intel_get_drm_devid(__fd))
+/* Blitter tiling definitions sanity checks */
+static_assert(T_LINEAR == I915_TILING_NONE, "Linear definitions have to match");
+static_assert(T_XMAJOR == I915_TILING_X, "TileX definitions have to match");
+static_assert(T_YMAJOR == I915_TILING_Y, "TileY definitions have to match");
+static_assert(T_YFMAJOR == I915_TILING_Yf, "TileYf definitions have to match");
+
enum blt_special_mode {
SM_NONE,
SM_FULL_RESOLVE,
diff --git a/tests/i915/gem_blits.c b/tests/i915/gem_blits.c
index b38d6c7e..4aa8624c 100644
--- a/tests/i915/gem_blits.c
+++ b/tests/i915/gem_blits.c
@@ -72,7 +72,7 @@ get_tiling_stride(const struct device *device,
if (tiling) {
if (device->gen < 3)
stride = ALIGN(stride, 128);
- else if (device->gen < 4 || tiling == I915_TILING_X)
+ else if (device->gen < 4 || tiling == T_XMAJOR)
stride = ALIGN(stride, 512);
else
stride = ALIGN(stride, 128);
@@ -96,7 +96,7 @@ get_tiling_height(const struct device *device,
if (device->gen < 3)
return ALIGN(height, 16);
- else if (device->gen < 4 || tiling == I915_TILING_X)
+ else if (device->gen < 4 || tiling == T_XMAJOR)
return ALIGN(height, 8);
else
return ALIGN(height, 32);
@@ -117,8 +117,8 @@ static struct buffer *buffer_create(const struct device *device,
buffer->width = width;
buffer->height = height;
- buffer->tiling = I915_TILING_NONE;
- buffer->stride = get_tiling_stride(device, width, I915_TILING_NONE);
+ buffer->tiling = T_LINEAR;
+ buffer->stride = get_tiling_stride(device, width, T_LINEAR);
buffer->size = ALIGN(buffer->stride * height, 4096);
buffer->handle = gem_create(device->fd, buffer->size);
buffer->caching = device->llc;
@@ -196,16 +196,16 @@ static void buffer_set_tiling(const struct device *device,
i = 0;
- if ((tiling | buffer->tiling) >= I915_TILING_Y) {
+ if ((tiling | buffer->tiling) >= T_YMAJOR) {
unsigned int mask;
batch[i++] = MI_LOAD_REGISTER_IMM(1);
batch[i++] = BCS_SWCTRL;
mask = (BCS_SRC_Y | BCS_DST_Y) << 16;
- if (buffer->tiling == I915_TILING_Y)
+ if (buffer->tiling == T_YMAJOR)
mask |= BCS_SRC_Y;
- if (tiling == I915_TILING_Y)
+ if (tiling == T_YMAJOR)
mask |= BCS_DST_Y;
batch[i++] = mask;
}
@@ -218,9 +218,9 @@ static void buffer_set_tiling(const struct device *device,
batch[i++] = fast_copy_dword0(buffer->tiling, tiling);
/* Post ATS-M platforms require tile4 bit to be set for YMAJOR mode */
dword1 = fast_copy_dword1(buffer->tiling ?
- I915_TILING_Yf : I915_TILING_NONE,
+ T_YFMAJOR : T_LINEAR,
tiling ?
- I915_TILING_Yf : I915_TILING_NONE,
+ T_YFMAJOR : T_LINEAR,
32);
batch[i++] = dword1 | pitch;
} else {
@@ -258,7 +258,7 @@ static void buffer_set_tiling(const struct device *device,
if (has_64b_reloc)
batch[i++] = obj[1].offset >> 32;
- if ((tiling | buffer->tiling) >= I915_TILING_Y) {
+ if ((tiling | buffer->tiling) >= T_YMAJOR) {
igt_assert(device->gen >= 6);
batch[i++] = MI_FLUSH_DW_CMD | 2;
batch[i++] = 0;
@@ -353,14 +353,14 @@ static bool blit_to_linear(const struct device *device,
batch = gem_mmap__cpu(device->fd, obj[2].handle, 0, 4096, PROT_WRITE);
- if (buffer->tiling >= I915_TILING_Y) {
+ if (buffer->tiling >= T_YMAJOR) {
unsigned int mask;
batch[i++] = MI_LOAD_REGISTER_IMM(1);
batch[i++] = BCS_SWCTRL;
mask = (BCS_SRC_Y | BCS_DST_Y) << 16;
- if (buffer->tiling == I915_TILING_Y)
+ if (buffer->tiling == T_YMAJOR)
mask |= BCS_SRC_Y;
batch[i++] = mask;
}
@@ -369,7 +369,7 @@ static bool blit_to_linear(const struct device *device,
batch[i++] = fast_copy_dword0(buffer->tiling, 0);
/* Post ATS-M platforms require tile4 bit to be set for YMAJOR mode */
dword1 = fast_copy_dword1(buffer->tiling ?
- I915_TILING_Yf : I915_TILING_NONE,
+ T_YFMAJOR : T_LINEAR,
0, 32);
batch[i++] = dword1 | buffer->stride;
} else {
@@ -405,7 +405,7 @@ static bool blit_to_linear(const struct device *device,
if (has_64b_reloc)
batch[i++] = obj[1].offset >> 32;
- if (buffer->tiling >= I915_TILING_Y) {
+ if (buffer->tiling >= T_YMAJOR) {
igt_assert(device->gen >= 6);
batch[i++] = MI_FLUSH_DW_CMD | 2;
batch[i++] = 0;
@@ -693,16 +693,16 @@ blit(const struct device *device,
}
batch = gem_mmap__cpu(device->fd, obj[2].handle, 0, 4096, PROT_WRITE);
- if ((src->tiling | dst->tiling) >= I915_TILING_Y) {
+ if ((src->tiling | dst->tiling) >= T_YMAJOR) {
unsigned int mask;
batch[i++] = MI_LOAD_REGISTER_IMM(1);
batch[i++] = BCS_SWCTRL;
mask = (BCS_SRC_Y | BCS_DST_Y) << 16;
- if (src->tiling == I915_TILING_Y)
+ if (src->tiling == T_YMAJOR)
mask |= BCS_SRC_Y;
- if (dst->tiling == I915_TILING_Y)
+ if (dst->tiling == T_YMAJOR)
mask |= BCS_DST_Y;
batch[i++] = mask;
}
@@ -715,9 +715,9 @@ blit(const struct device *device,
batch[i++] = fast_copy_dword0(src->tiling, dst->tiling);
/* Post ATS-M platforms require tile4 bit to be set for YMAJOR mode */
dword1 = fast_copy_dword1(src->tiling ?
- I915_TILING_Yf : I915_TILING_NONE,
+ T_YFMAJOR : T_LINEAR,
dst->tiling ?
- I915_TILING_Yf : I915_TILING_NONE,
+ T_YFMAJOR : T_LINEAR,
32);
batch[i++] = dword1 | pitch;
} else {
@@ -755,7 +755,7 @@ blit(const struct device *device,
if (has_64b_reloc)
batch[i++] = obj[1].offset >> 32;
- if ((src->tiling | dst->tiling) >= I915_TILING_Y) {
+ if ((src->tiling | dst->tiling) >= T_YMAJOR) {
igt_assert(device->gen >= 6);
batch[i++] = MI_FLUSH_DW_CMD | 2;
batch[i++] = 0;
@@ -803,6 +803,15 @@ static int start_at(int x, enum start s)
}
}
+static bool blit_supports_tiling(int fd, enum blt_tiling_type tiling)
+{
+ if (blt_has_xy_src_copy(fd))
+ return blt_xy_src_copy_supports_tiling(fd, tiling);
+
+ /* Test is run on newer platform, so check fast-copy support instead */
+ return blt_fast_copy_supports_tiling(fd, tiling);
+}
+
igt_main
{
struct device device;
@@ -835,15 +844,20 @@ igt_main
width * 16, height * 4);
y = start_at(height, y0);
- for (unsigned int src_tiling = I915_TILING_NONE;
- src_tiling <= (device.gen >= 6 ? I915_TILING_Y : I915_TILING_X);
- src_tiling++) {
+
+ for (unsigned int src_tiling = T_LINEAR;
+ src_tiling <= T_YMAJOR; src_tiling++) {
+ if (!blit_supports_tiling(device.fd, src_tiling))
+ continue;
+
buffer_set_tiling(&device, src, src_tiling);
x = start_at(width, x0);
- for (unsigned int dst_tiling = I915_TILING_NONE;
- dst_tiling <= (device.gen >= 6 ? I915_TILING_Y : I915_TILING_X);
- dst_tiling++) {
+ for (unsigned int dst_tiling = T_LINEAR;
+ dst_tiling <= T_YMAJOR; dst_tiling++) {
+ if (!blit_supports_tiling(device.fd, dst_tiling))
+ continue;
+
buffer_set_tiling(&device, dst, dst_tiling);
for (enum mode down = CPU; down <= WC; down++) {
--
2.25.1
More information about the igt-dev
mailing list