Merge branch 'bugfix/fix_examples_qspi_without_ram_avoid_tear' into '…

…master' fix(examples): fix qspi_without_ram build error when enable avoid tearing See merge request ae_group/esp-iot-solution!1076
espressif · Sep 5, 2024 · 09c4d11 · 09c4d11
2 parents 02dfaf8 + e71f4e2
commit 09c4d11
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 5 deletions.
diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
@@ -343,6 +343,16 @@ build_example_display_lcd_qspi_with_ram:
   variables:
     EXAMPLE_DIR: examples/display/lcd/qspi_with_ram
 
+build_example_display_lcd_qspi_without_ram:
+  extends:
+    - .build_examples_template
+    - .rules:build:example_display_lcd_qspi_without_ram
+  parallel:
+    matrix:
+      - IMAGE: espressif/idf:release-v5.3
+  variables:
+    EXAMPLE_DIR: examples/display/lcd/qspi_without_ram
+
 build_example_display_lcd_rgb_lcd_8bit:
   extends:
     - .build_examples_template

diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
@@ -404,7 +404,7 @@
   - "examples/display/lcd/qspi_with_ram/**/*"
 
 .patterns-example_display_lcd_qspi_without_ram: &patterns-example_display_lcd_qspi_without_ram
-  - "examples/display/lcd/qspi_without_ram/**"
+  - "examples/display/lcd/qspi_without_ram/**/*"
 
 .patterns-example_display_lcd_rgb_lcd_8bit: &patterns-example_display_lcd_rgb_lcd_8bit
   - "examples/display/lcd/rgb_lcd_8bit/**/*"

diff --git a/examples/.build-rules.yml b/examples/.build-rules.yml
@@ -128,6 +128,10 @@ examples/display/lcd/qspi_with_ram:
   enable:
     - if: IDF_TARGET in ["esp32","esp32c2","esp32c3","esp32c6","esp32h2","esp32s2", "esp32s3"] and (IDF_VERSION_MAJOR == 5 and IDF_VERSION_MINOR == 1)
 
+examples/display/lcd/qspi_without_ram:
+  enable:
+    - if: IDF_TARGET in ["esp32s3"] and (IDF_VERSION_MAJOR == 5 and IDF_VERSION_MINOR == 3)
+
 examples/display/lcd/rgb_lcd_8bit:
   enable:
     - if: IDF_TARGET in ["esp32s3"]

diff --git a/examples/display/lcd/qspi_without_ram/main/lvgl_port.c b/examples/display/lcd/qspi_without_ram/main/lvgl_port.c
@@ -405,7 +405,7 @@ static lv_disp_t *display_init(esp_lcd_panel_handle_t panel_handle)
     st77903_qspi_event_callbacks_t cbs = {
         .on_vsync = qspi_lcd_on_trans_event,
     };
-    esp_lcd_st77903_qspi_register_event_callbacks(lcd_handle, &cbs, NULL);
+    esp_lcd_st77903_qspi_register_event_callbacks(panel_handle, &cbs, NULL);
 #else
     // Normmaly, for QSPI LCD, we just use one buffer for LVGL rendering
     buffer_size = LVGL_PORT_H_RES * LVGL_PORT_BUFFER_HEIGHT;

diff --git a/examples/display/lcd/qspi_without_ram/sdkconfig.ci.avoid_tear_mode1 b/examples/display/lcd/qspi_without_ram/sdkconfig.ci.avoid_tear_mode1
@@ -1,3 +1,3 @@
 CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_ENABLE=y
 CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE_1=y
-CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE=1
+CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE=0
diff --git a/examples/display/lcd/qspi_without_ram/sdkconfig.ci.avoid_tear_mode2 b/examples/display/lcd/qspi_without_ram/sdkconfig.ci.avoid_tear_mode2
@@ -1,3 +1,3 @@
 CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_ENABLE=y
 CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE_2=y
-CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE=2
+CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE=1
diff --git a/examples/display/lcd/qspi_without_ram/sdkconfig.ci.avoid_tear_mode3 b/examples/display/lcd/qspi_without_ram/sdkconfig.ci.avoid_tear_mode3
@@ -1,3 +1,3 @@
 CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_ENABLE=y
 CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE_3=y
-CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE=3
+CONFIG_EXAMPLE_LVGL_PORT_AVOID_TEAR_MODE=2