feat(dma2d): improve DMA2D Compatibility (#8293)

src/draw/dma2d/lv_draw_dma2d.c

@@ -211,72 +211,16 @@ void lv_draw_dma2d_configure_and_start_transfer(const lv_draw_dma2d_configuratio
 #if LV_DRAW_DMA2D_CACHE
 void lv_draw_dma2d_invalidate_cache(const lv_draw_dma2d_cache_area_t * mem_area)
 {
-    if((SCB->CCR & SCB_CCR_DC_Msk) == 0) return; /* data cache is disabled */
-
-    uint32_t rows_remaining = mem_area->height;
-    uint32_t row_addr = (uint32_t)(uintptr_t) mem_area->first_byte;
-    uint32_t row_end_addr = 0;
-
-    __DSB();
-
-    while(rows_remaining) {
-        uint32_t addr = row_addr & ~(__SCB_DCACHE_LINE_SIZE - 1U);
-        uint32_t cache_lines = ((((row_addr + mem_area->width_bytes - 1) & ~(__SCB_DCACHE_LINE_SIZE - 1U)) - addr) /
-                                __SCB_DCACHE_LINE_SIZE) + 1;
-
-        if(addr == row_end_addr) {
-            addr += __SCB_DCACHE_LINE_SIZE;
-            cache_lines--;
-        }
-
-        while(cache_lines) {
-            SCB->DCIMVAC = addr;
-            addr += __SCB_DCACHE_LINE_SIZE;
-            cache_lines--;
-        }
-
-        row_end_addr = addr - __SCB_DCACHE_LINE_SIZE;
-        row_addr += mem_area->stride;
-        rows_remaining--;
-    };
-
-    __DSB();
-    __ISB();
+    if(SCB->CCR & SCB_CCR_DC_Msk) {
+        SCB_InvalidateDCache();
+    }
 }
 
 void lv_draw_dma2d_clean_cache(const lv_draw_dma2d_cache_area_t * mem_area)
 {
-    if((SCB->CCR & SCB_CCR_DC_Msk) == 0) return;  /* data cache is disabled */
-
-    uint32_t rows_remaining = mem_area->height;
-    uint32_t row_addr = (uint32_t)(uintptr_t) mem_area->first_byte;
-    uint32_t row_end_addr = 0;
-
-    __DSB();
-
-    while(rows_remaining) {
-        uint32_t addr = row_addr & ~(__SCB_DCACHE_LINE_SIZE - 1U);
-        uint32_t cache_lines = ((((row_addr + mem_area->width_bytes - 1) & ~(__SCB_DCACHE_LINE_SIZE - 1U)) - addr) /
-                                __SCB_DCACHE_LINE_SIZE) + 1;
-
-        if(addr == row_end_addr) {
-            addr += __SCB_DCACHE_LINE_SIZE;
-            cache_lines--;
-        }
-
-        while(cache_lines) {
-            SCB->DCCMVAC = addr;
-            addr += __SCB_DCACHE_LINE_SIZE;
-            cache_lines--;
-        }
-
-        row_end_addr = addr - __SCB_DCACHE_LINE_SIZE;
-        row_addr += mem_area->stride;
-        rows_remaining--;
-    };
-
-    __DSB();
-    __ISB();
+    if(SCB->CCR & SCB_CCR_DC_Msk) {
+        SCB_CleanDCache();
+    }
 }
 #endif
 

src/draw/dma2d/lv_draw_dma2d_fill.c

@@ -93,8 +93,9 @@ void lv_draw_dma2d_fill(lv_draw_task_t * t, void * first_pixel, int32_t w, int32
 #endif
 
     uint32_t output_offset = (stride / cf_size) - w;
+
     lv_draw_dma2d_configuration_t conf = {
-        .mode = LV_DRAW_DMA2D_MODE_MEMORY_TO_MEMORY_WITH_BLENDING_AND_FIXED_COLOR_FG,
+        .mode = LV_DRAW_DMA2D_MODE_MEMORY_TO_MEMORY_WITH_BLENDING,
         .w = w,
         .h = h,
 
@@ -103,11 +104,16 @@ void lv_draw_dma2d_fill(lv_draw_task_t * t, void * first_pixel, int32_t w, int32
         .output_cf = output_cf,
 
         .fg_color = lv_color_to_u32(color),
+        .fg_address = first_pixel,
+        .fg_offset = output_offset,
         .fg_alpha_mode = LV_DRAW_DMA2D_ALPHA_MODE_REPLACE_ALPHA_CHANNEL,
         .fg_alpha = opa,
+        .fg_cf = LV_DRAW_DMA2D_FGBG_CF_A8,
 
         .bg_address = first_pixel,
         .bg_offset = output_offset,
+        .bg_alpha_mode = LV_DRAW_DMA2D_ALPHA_MODE_NO_MODIFY_IMAGE_ALPHA_CHANNEL,
+        .bg_alpha = opa,
         .bg_cf = (lv_draw_dma2d_fgbg_cf_t) output_cf
     };
 

src/draw/dma2d/lv_draw_dma2d_private.h

@@ -31,7 +31,7 @@ extern "C" {
 #define LV_DRAW_DMA2D_ASYNC 0
 #endif
 
-#if defined(__CORTEX_M) && (__CORTEX_M == 7)
+#if defined(__CORTEX_M) && ((__CORTEX_M == 7) || (__CORTEX_M == 55))
 #define LV_DRAW_DMA2D_CACHE 1
 #else
 #define LV_DRAW_DMA2D_CACHE 0