tests: drivers: display: add support for htiled mode

Added test support for htiled displays

Signed-off-by: Yishai Jaffe <[email protected]>

Author: yishai1999

tests/drivers/display/display_read_write/src/main.c

@@ -22,7 +22,8 @@ static uint8_t disp_buffer[DT_PROP(DT_CHOSEN(zephyr_display), width) *
 	__aligned(CONFIG_DISPLAY_BUFFER_ALIGNMENT);
 static struct display_capabilities cfg;
 static uint8_t bpp;
-static bool is_tiled;
+static bool is_vtiled;
+static bool is_htiled;
 
 static inline uint8_t bytes_per_pixel(enum display_pixel_format pixel_format)
 {
@@ -57,7 +58,7 @@ static void verify_bytes_of_area(uint8_t *data, int cmp_x, int cmp_y, size_t wid
 
 	zassert_ok(err, "display_read failed");
 
-	if (is_tiled) {
+	if (is_vtiled || is_htiled) {
 		zassert_mem_equal(data, disp_buffer, width * height / 8, NULL);
 	} else {
 		zassert_mem_equal(data, disp_buffer, width * height * bpp, NULL);
@@ -66,7 +67,7 @@ static void verify_bytes_of_area(uint8_t *data, int cmp_x, int cmp_y, size_t wid
 
 static void verify_background_color(int x, int y, size_t width, size_t height, uint32_t color)
 {
-	size_t buf_size = is_tiled ? (height * width / 8) : (height * width * bpp);
+	size_t buf_size = height * width * bpp / ((is_vtiled || is_htiled) ? 8 : 1);
 	struct display_buffer_descriptor desc = {
 		.height = height,
 		.pitch = width,
@@ -90,7 +91,7 @@ static void verify_background_color(int x, int y, size_t width, size_t height, u
 			zassert_equal(buf16[i], (uint16_t)color, "@%d", i);
 			break;
 		case 1:
-			if (is_tiled) {
+			if (is_vtiled) {
 				uint16_t x = i % (width);
 				uint16_t line = (i - x) / width;
 				uint16_t tile = line / 8;
@@ -99,6 +100,10 @@ static void verify_background_color(int x, int y, size_t width, size_t height, u
 				uint8_t *tptr = disp_buffer + (tile * width + x);
 
 				zassert_equal(!!(*tptr & BIT(y)), !!(color), "@%d", i);
+			} else if (is_htiled) {
+				uint8_t *tptr = disp_buffer + i / 8;
+
+				zassert_equal(!!(*tptr & BIT(i % 8)), !!(color), "@%d", i);
 			} else {
 				zassert_equal(buf8[i], (uint8_t)color, "@%d", i);
 			}
@@ -114,7 +119,8 @@ static void display_before(void *text_fixture)
 {
 	display_get_capabilities(dev, &cfg);
 	bpp = bytes_per_pixel(cfg.current_pixel_format);
-	is_tiled = ((bpp == 1) && (cfg.screen_info & SCREEN_INFO_MONO_VTILED));
+	is_vtiled = (bpp == 1 && (cfg.screen_info & SCREEN_INFO_MONO_VTILED));
+	is_htiled = (bpp == 1 && !(cfg.screen_info & SCREEN_INFO_MONO_VTILED));
 
 	struct display_buffer_descriptor desc = {
 		.height = display_height,
@@ -143,8 +149,8 @@ ZTEST(display_read_write, test_clear)
 ZTEST(display_read_write, test_write_to_buffer_head)
 {
 	uint8_t data[4] = {0xFA, 0xAF, 0x9F, 0xFA};
-	uint8_t height = (is_tiled ? 8 : 1);
-	uint16_t width = sizeof(data) / bpp;
+	uint8_t height = (is_vtiled ? 8 : 1);
+	uint16_t width = sizeof(data) / bpp * (is_htiled ? 8 : 1);
 	uint16_t buf_size = width * bpp;
 	struct display_buffer_descriptor desc = {
 		.height = height,
@@ -171,8 +177,8 @@ ZTEST(display_read_write, test_write_to_buffer_head)
 ZTEST(display_read_write, test_write_to_buffer_tail)
 {
 	uint8_t data[4] = {0xFA, 0xAF, 0x9F, 0xFA};
-	uint16_t height = (is_tiled ? 8 : 1);
-	uint16_t width = sizeof(data) / bpp;
+	uint16_t height = (is_vtiled ? 8 : 1);
+	uint16_t width = sizeof(data) / bpp * (is_htiled ? 8 : 1);
 	uint16_t buf_size = width * bpp;
 	struct display_buffer_descriptor desc = {
 		.height = height,
@@ -196,7 +202,7 @@ ZTEST(display_read_write, test_write_to_buffer_tail)
 	zassert_ok(err, "display_read failed");
 
 	/* check write data and read data are same */
-	if (is_tiled) {
+	if (is_vtiled || is_htiled) {
 		zassert_mem_equal(data,
 				  disp_buffer + (display_width * display_height / 8 - buf_size),
 				  buf_size, NULL);
@@ -217,8 +223,8 @@ ZTEST(display_read_write, test_write_to_buffer_tail)
 ZTEST(display_read_write, test_read_does_not_clear_existing_buffer)
 {
 	uint8_t data[4] = {0xFA, 0xAF, 0x9F, 0xFA};
-	uint8_t height = (is_tiled ? 8 : 1);
-	uint16_t width = sizeof(data) / bpp;
+	uint8_t height = (is_vtiled ? 8 : 1);
+	uint16_t width = sizeof(data) / bpp * (is_htiled ? 8 : 1);
 	uint16_t buf_size = width * bpp;
 	struct display_buffer_descriptor desc = {
 		.height = height,
@@ -252,7 +258,7 @@ ZTEST(display_read_write, test_read_does_not_clear_existing_buffer)
 	zassert_ok(err, "display_read failed");
 
 	/* checking correctly write to the tail of buffer */
-	if (is_tiled) {
+	if (is_vtiled || is_htiled) {
 		zassert_mem_equal(data,
 				  disp_buffer + (display_width * display_height / 8 - buf_size),
 				  buf_size, NULL);

tests/drivers/display/display_read_write/testcase.yaml

@@ -19,31 +19,61 @@ tests:
     extra_configs:
       - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_RGB_888=y
       - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
-  drivers.display.read_write.sdl.mono01:
+  drivers.display.read_write.sdl.mono01.vtiled.msbfirst:
     platform_allow:
       - native_sim
     extra_configs:
       - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO01=y
       - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
-  drivers.display.read_write.sdl.mono10:
+  drivers.display.read_write.sdl.mono10.vtiled.msbfirst:
     platform_allow:
       - native_sim
     extra_configs:
       - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO10=y
       - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
-  drivers.display.read_write.sdl.mono01.lsbfirst:
+  drivers.display.read_write.sdl.mono01.htiled.msbfirst:
     platform_allow:
       - native_sim
     extra_configs:
       - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO01=y
       - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
+      - CONFIG_SDL_DISPLAY_MONO_VTILED=n
+  drivers.display.read_write.sdl.mono10.htiled.msbfirst:
+    platform_allow:
+      - native_sim
+    extra_configs:
+      - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO10=y
+      - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
+      - CONFIG_SDL_DISPLAY_MONO_VTILED=n
+  drivers.display.read_write.sdl.mono01.vtiled.lsbfirst:
+    platform_allow:
+      - native_sim
+    extra_configs:
+      - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO01=y
+      - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
+      - CONFIG_SDL_DISPLAY_MONO_MSB_FIRST=n
+  drivers.display.read_write.sdl.mono10.vtiled.lsbfirst:
+    platform_allow:
+      - native_sim
+    extra_configs:
+      - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO10=y
+      - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
+      - CONFIG_SDL_DISPLAY_MONO_MSB_FIRST=n
+  drivers.display.read_write.sdl.mono01.htiled.lsbfirst:
+    platform_allow:
+      - native_sim
+    extra_configs:
+      - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO01=y
+      - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
+      - CONFIG_SDL_DISPLAY_MONO_VTILED=n
       - CONFIG_SDL_DISPLAY_MONO_MSB_FIRST=n
-  drivers.display.read_write.sdl.mono10.lsbfirst:
+  drivers.display.read_write.sdl.mono10.htiled.lsbfirst:
     platform_allow:
       - native_sim
     extra_configs:
       - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO10=y
       - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
+      - CONFIG_SDL_DISPLAY_MONO_VTILED=n
       - CONFIG_SDL_DISPLAY_MONO_MSB_FIRST=n
   drivers.display.read_write.sdl.rgb565:
     platform_allow: