Working on RGB Bus driver to improve performance and also provide rotation

Author: kdschlosser

api_drivers/common_api_drivers/display/nv3041a/nv3041a.py

@@ -199,5 +199,5 @@ def _flush_cb(self, _, area, color_p):
 
         first_chunk = int(size / 10)
 
-        self._data_bus.tx_color(self.__ramwr, data_view[:first_chunk], x1, y1, x2, y2)
-        self._data_bus.tx_color(self.__ramwrc, data_view[first_chunk:], x1, y1, x2, y2)
+        self._data_bus.tx_color(self.__ramwr, data_view[:first_chunk], x1, y1, x2, y2, self._rotation, False)
+        self._data_bus.tx_color(self.__ramwrc, data_view[first_chunk:], x1, y1, x2, y2, self._rotation, self._disp_drv.flush_is_last())

api_drivers/py_api_drivers/frozen/display/display_driver_framework.py

@@ -616,7 +616,7 @@ def _flush_cb(self, _, area, color_p):
         # what converts from the C_Array object the binding passes into a
         # memoryview object that can be passed to the bus drivers
         data_view = color_p.__dereference__(size)
-        self._data_bus.tx_color(cmd, data_view, x1, y1, x2, y2)
+        self._data_bus.tx_color(cmd, data_view, x1, y1, x2, y2, self._rotation, self._disp_drv.flush_is_last())
 
     # we always register this callback no matter what. This is what tells LVGL
     # that the buffer is able to be written to. If this callback doesn't get

ext_mod/lcd_bus/common_src/i80_bus.c

@@ -76,7 +76,7 @@
     /* forward declarations */
     mp_lcd_err_t i80_rx_param(mp_obj_t obj, int lcd_cmd, void *param, size_t param_size);
     mp_lcd_err_t i80_tx_param(mp_obj_t obj, int lcd_cmd, void *param, size_t param_size);
-    mp_lcd_err_t i80_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end);
+    mp_lcd_err_t i80_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end, uint8_t rotation, bool last_update);
     mp_lcd_err_t i80_del(mp_obj_t obj);
     mp_lcd_err_t i80_init(mp_obj_t obj, uint16_t width, uint16_t height, uint8_t bpp, uint32_t buffer_size, bool rgb565_byte_swap, uint8_t cmd_bits, uint8_t param_bits);
     mp_lcd_err_t i80_get_lane_count(mp_obj_t obj, uint8_t *lane_count);
@@ -343,12 +343,14 @@
     }
 
 
-    mp_lcd_err_t i80_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end)
+    mp_lcd_err_t i80_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end, uint8_t rotation, bool last_update)
     {
         LCD_UNUSED(x_start);
         LCD_UNUSED(y_start);
         LCD_UNUSED(x_end);
         LCD_UNUSED(y_end);
+        LCD_UNUSED(rotation);
+        LCD_UNUSED(last_update);
 
         mp_lcd_i80_bus_obj_t *self = MP_OBJ_TO_PTR(obj);
 

ext_mod/lcd_bus/common_src/spi_bus.c

@@ -79,7 +79,7 @@
     mp_lcd_err_t s_spi_get_lane_count(mp_obj_t obj, uint8_t *lane_count);
     mp_lcd_err_t s_spi_rx_param(mp_obj_t obj, int lcd_cmd, void *param, size_t param_size);
     mp_lcd_err_t s_spi_tx_param(mp_obj_t obj, int lcd_cmd, void *param, size_t param_size);
-    mp_lcd_err_t s_spi_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end);
+    mp_lcd_err_t s_spi_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end, uint8_t rotation, bool last_update);
 
     void send_param_16(mp_lcd_spi_bus_obj_t *self, void *param, size_t param_size);
     void send_param_8(mp_lcd_spi_bus_obj_t *self, void *param, size_t param_size);
@@ -269,12 +269,14 @@
     }
 
 
-    mp_lcd_err_t s_spi_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end)
+    mp_lcd_err_t s_spi_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end, uint8_t rotation, bool last_update)
     {
         LCD_UNUSED(x_start);
         LCD_UNUSED(y_start);
         LCD_UNUSED(x_end);
         LCD_UNUSED(y_end);
+        LCD_UNUSED(rotation);
+        LCD_UNUSED(last_update);
 
         mp_lcd_spi_bus_obj_t *self = MP_OBJ_TO_PTR(obj);
 

ext_mod/lcd_bus/esp32_include/rgb_bus.h

@@ -11,19 +11,37 @@
         #include "esp_lcd_panel_io.h"
         #include "esp_lcd_panel_rgb.h"
 
+        #include "freertos/FreeRTOS.h"
+        #include "freertos/task.h"
+        #include "freertos/semphr.h"
+        #include "freertos/event_groups.h"
+        #include "freertos/idf_additions.h"
+
         // micropython includes
         #include "mphalport.h"
         #include "py/obj.h"
         #include "py/objarray.h"
-        #include "soc/soc_caps.h"
+
+
+        typedef struct _rgb_bus_lock_t {
+            SemaphoreHandle_t handle;
+            StaticSemaphore_t buffer;
+        } rgb_bus_lock_t;
+
+        typedef struct _rgb_bus_event_t {
+            EventGroupHandle_t handle;
+            StaticEventGroup_t buffer;
+        } rgb_bus_event_t;
+
 
         typedef struct _mp_lcd_rgb_bus_obj_t {
             mp_obj_base_t base;
 
             mp_obj_t callback;
 
-            void *buf1;
-            void *buf2;
+            mp_obj_array_t *view1;
+            mp_obj_array_t *view2;
+
             uint32_t buffer_flags;
 
             bool trans_done;
@@ -36,13 +54,47 @@
 
             esp_lcd_panel_handle_t panel_handle;
             uint32_t buffer_size;
-            mp_obj_array_t *view1;
-            mp_obj_array_t *view2;
 
-            void *last_buf;
+            uint8_t *active_fb;
+            uint8_t *idle_fb;
+            uint8_t *partial_buf;
+
+            int x_start;
+            int y_start;
+            int x_end;
+            int y_end;
+            uint16_t width;
+            uint16_t height;
+            uint8_t rotation: 2;
+            uint8_t bytes_per_pixel: 2;
+
+            rgb_bus_lock_t copy_lock;
+            rgb_bus_event_t copy_task_exit;
+            rgb_bus_event_t last_update;
+            rgb_bus_event_t partial_copy;
+            rgb_bus_event_t swap_bufs;
+            rgb_bus_lock_t swap_lock;
+
+            TaskHandle_t copy_task_handle;
 
         } mp_lcd_rgb_bus_obj_t;
 
+        void rgb_bus_event_init(rgb_bus_event_t *event);
+        void rgb_bus_event_delete(rgb_bus_event_t *event);
+        bool rgb_bus_event_isset(rgb_bus_event_t *event);
+        void rgb_bus_event_set(rgb_bus_event_t *event);
+        void rgb_bus_event_clear(rgb_bus_event_t *event);
+        void rgb_bus_event_clear_from_isr(rgb_bus_event_t *event);
+        bool rgb_bus_event_isset_from_isr(rgb_bus_event_t *event);
+        void rgb_bus_event_set_from_isr(rgb_bus_event_t *event);
+
+        int  rgb_bus_lock_acquire(thread_lock_t *lock, int32_t wait_ms);
+        void rgb_bus_lock_release(rgb_bus_lock_t *lock);
+        void rgb_bus_lock_init(rgb_bus_lock_t *lock);
+        void rgb_bus_lock_delete(rgb_bus_lock_t *lock);
+        void rgb_bus_lock_release_from_isr(rgb_bus_lock_t *lock);
+
+        void rgb_bus_copy_task(void *self_in);
 
         extern const mp_obj_type_t mp_lcd_rgb_bus_type;
 

ext_mod/lcd_bus/esp32_src/dsi_bus.c

@@ -37,7 +37,7 @@
     mp_lcd_err_t dsi_del(mp_obj_t obj);
     mp_lcd_err_t dsi_init(mp_obj_t obj, uint16_t width, uint16_t height, uint8_t bpp, uint32_t buffer_size, bool rgb565_byte_swap, uint8_t cmd_bits, uint8_t param_bits);
     mp_lcd_err_t dsi_get_lane_count(mp_obj_t obj, uint8_t *lane_count);
-    mp_lcd_err_t dsi_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end);
+    mp_lcd_err_t dsi_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end, , uint8_t rotation, bool last_update);
     mp_obj_t dsi_allocate_framebuffer(mp_obj_t obj, uint32_t size, uint32_t caps);
     mp_obj_t dsi_free_framebuffer(mp_obj_t obj, mp_obj_t buf);
 
@@ -383,11 +383,13 @@
     }
 
 
-    mp_lcd_err_t dsi_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end)
+    mp_lcd_err_t dsi_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end, uint8_t rotation, bool last_update)
     {
     #if CONFIG_LCD_ENABLE_DEBUG_LOG
         printf("dsi_tx_color(self, lcd_cmd=%d, color, color_size=%d, x_start=%d, y_start=%d, x_end=%d, y_end=%d)\n", lcd_cmd, color_size, x_start, y_start, x_end, y_end);
     #endif
+        LCD_UNUSED(rotation);
+        LCD_UNUSED(last_update);
 
         mp_lcd_dsi_bus_obj_t *self = (mp_lcd_dsi_bus_obj_t *)obj;
 

ext_mod/lcd_bus/esp32_src/led_bus.c

@@ -78,7 +78,7 @@ mp_lcd_err_t led_init(mp_obj_t obj, uint16_t width, uint16_t height, uint8_t bpp
 mp_lcd_err_t led_get_lane_count(mp_obj_t obj, uint8_t *lane_count);
 mp_lcd_err_t led_rx_param(mp_obj_t obj, int lcd_cmd, void *param, size_t param_size);
 mp_lcd_err_t led_tx_param(mp_obj_t obj, int lcd_cmd, void *param, size_t param_size);
-mp_lcd_err_t led_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end);
+mp_lcd_err_t led_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end, uint8_t rotation, bool last_update);
 mp_obj_t led_allocate_framebuffer(mp_obj_t obj, uint32_t size, uint32_t caps);
 mp_obj_t led_free_framebuffer(mp_obj_t obj, mp_obj_t buf);
 
@@ -486,13 +486,16 @@ mp_lcd_err_t led_get_lane_count(mp_obj_t obj, uint8_t *lane_count)
 }
 
 
-mp_lcd_err_t led_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end)
+mp_lcd_err_t led_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end, uint8_t rotation, bool last_update)
 {
     LCD_UNUSED(lcd_cmd);
     LCD_UNUSED(x_start);
     LCD_UNUSED(y_start);
     LCD_UNUSED(x_end);
     LCD_UNUSED(y_end);
+    LCD_UNUSED(rotation);
+    LCD_UNUSED(last_update);
+
     mp_lcd_led_bus_obj_t *self = (mp_lcd_led_bus_obj_t *)obj;
     mp_lcd_err_t err;
     uint8_t tmp_color[4];