DRM formats are defined to be little-endian, unless the
DRM_FORMAT_BIG_ENDIAN flag is set. Hence writes of multi-byte pixel
values need to take endianness into account.
Introduce a swap32() helper to byteswap 32-bit values, and a
cpu_to_le32() helper to convert 32-bit values from CPU-endian to
little-endian, and use the latter in the various pattern fill functions
for 32-bit formats.
Signed-off-by: Geert Uytterhoeven <ge...@linux-m68k.org>
Acked-by: Pekka Paalanen <pekka.paala...@collabora.com>
---
v4:
- Use new HAVE_BIG_ENDIAN symbol,
v3:
- Increase indentation after definition of cpu_to_le32(),
v2:
- Add Acked-by,
- Add swap32() intermediate helper,
- Add __ARM_BIG_ENDIAN and __s390__.
---
tests/util/pattern.c | 32 +++++++++++++++++++++++---------
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/tests/util/pattern.c b/tests/util/pattern.c
index f69c5206d96eff02..c79cad2c6a23993f 100644
--- a/tests/util/pattern.c
+++ b/tests/util/pattern.c
@@ -61,6 +61,20 @@ struct color_yuv {
.u = MAKE_YUV_601_U(r, g, b), \
.v = MAKE_YUV_601_V(r, g, b) }
+static inline uint32_t swap32(uint32_t x)
+{
+ return ((x & 0x000000ffU) << 24) |
+ ((x & 0x0000ff00U) << 8) |
+ ((x & 0x00ff0000U) >> 8) |
+ ((x & 0xff000000U) >> 24);
+}
+
+#ifdef HAVE_BIG_ENDIAN
+#define cpu_to_le32(x) swap32(x)
+#else
+#define cpu_to_le32(x) (x)
+#endif
+
/* This function takes 8-bit color values */
static inline uint32_t shiftcolor8(const struct util_color_component *comp,
uint32_t value)
@@ -520,26 +534,26 @@ static void fill_smpte_rgb32(const struct util_rgb_info
*rgb, void *mem,
for (y = 0; y < height * 6 / 9; ++y) {
for (x = 0; x < width; ++x)
- ((uint32_t *)mem)[x] = colors_top[x * 7 / width];
+ ((uint32_t *)mem)[x] = cpu_to_le32(colors_top[x * 7 /
width]);
mem += stride;
}
for (; y < height * 7 / 9; ++y) {
for (x = 0; x < width; ++x)
- ((uint32_t *)mem)[x] = colors_middle[x * 7 / width];
+ ((uint32_t *)mem)[x] = cpu_to_le32(colors_middle[x * 7
/ width]);
mem += stride;
}
for (; y < height; ++y) {
for (x = 0; x < width * 5 / 7; ++x)
((uint32_t *)mem)[x] =
- colors_bottom[x * 4 / (width * 5 / 7)];
+ cpu_to_le32(colors_bottom[x * 4 / (width * 5 /
7)]);
for (; x < width * 6 / 7; ++x)
((uint32_t *)mem)[x] =
- colors_bottom[(x - width * 5 / 7) * 3
- / (width / 7) + 4];
+ cpu_to_le32(colors_bottom[(x - width * 5 / 7) *
3
+ / (width / 7) + 4]);
for (; x < width; ++x)
- ((uint32_t *)mem)[x] = colors_bottom[7];
+ ((uint32_t *)mem)[x] = cpu_to_le32(colors_bottom[7]);
mem += stride;
}
}
@@ -1315,7 +1329,7 @@ static void fill_tiles_rgb32(const struct
util_format_info *info, void *mem,
(rgb32 >> 8) & 0xff, rgb32 & 0xff,
alpha);
- ((uint32_t *)mem)[x] = color;
+ ((uint32_t *)mem)[x] = cpu_to_le32(color);
}
mem += stride;
}
@@ -1464,7 +1478,7 @@ static void fill_gradient_rgb32(const struct
util_rgb_info *rgb,
for (j = 0; j < width / 2; j++) {
uint32_t value = MAKE_RGBA10(rgb, j & 0x3ff, j & 0x3ff,
j & 0x3ff, 0);
- row[2*j] = row[2*j+1] = value;
+ row[2*j] = row[2*j+1] = cpu_to_le32(value);
}
mem += stride;
}
@@ -1474,7 +1488,7 @@ static void fill_gradient_rgb32(const struct
util_rgb_info *rgb,
for (j = 0; j < width / 2; j++) {
uint32_t value = MAKE_RGBA10(rgb, j & 0x3fc, j & 0x3fc,
j & 0x3fc, 0);
- row[2*j] = row[2*j+1] = value;
+ row[2*j] = row[2*j+1] = cpu_to_le32(value);
}
mem += stride;
}
--
2.34.1
