Merge pull request #1561 from microwavesafe/master

Remove dependency on ST CubeMX Hal

lv_conf_template.h

@@ -178,6 +178,9 @@ typedef void * lv_group_user_data_t;
 /* 1: Enable GPU interface*/
 #define LV_USE_GPU              1   /*Only enables `gpu_fill_cb` and `gpu_blend_cb` in the disp. drv- */
 #define LV_USE_GPU_STM32_DMA2D  0
+/*If enabling LV_USE_GPU_STM32_DMA2D, LV_GPU_DMA2D_CMSIS_INCLUDE must be defined to include path of CMSIS header of target processor
+e.g. "stm32f769xx.h" or "stm32f429xx.h" */
+#define LV_GPU_DMA2D_CMSIS_INCLUDE
 
 /* 1: Enable file system (might be required for images */
 #define LV_USE_FILESYSTEM       1
@@ -249,6 +252,10 @@ typedef void * lv_img_decoder_user_data_t;
  */
 #define LV_EXPORT_CONST_INT(int_value) struct _silence_gcc_warning
 
+/* Prefix variables that are used in GPU accelerated operations, often these need to be
+ * placed in RAM sections that are DMA accessible */
+#define LV_ATTRIBUTE_DMA
+
 /*===================
  *  HAL settings
  *==================*/

src/lv_conf_internal.h

@@ -363,6 +363,12 @@
 #define LV_EXPORT_CONST_INT(int_value) struct _silence_gcc_warning
 #endif
 
+/* Prefix variables that are used in GPU accelerated operations, often these need to be
+ * placed in RAM sections that are DMA accessible */
+#ifndef LV_ATTRIBUTE_DMA
+#define LV_ATTRIBUTE_DMA
+#endif
+
 /*===================
  *  HAL settings
  *==================*/

src/lv_core/lv_obj.c

@@ -38,6 +38,10 @@
 
 #include LV_THEME_DEFAULT_INCLUDE
 
+#if LV_USE_GPU_STM32_DMA2D
+#include "../lv_gpu/lv_gpu_stm32_dma2d.h"
+#endif
+
 /*********************
  *      DEFINES
  *********************/
@@ -140,6 +144,11 @@ void lv_init(void)
     _lv_group_init();
 #endif
 
+#if LV_USE_GPU_STM32_DMA2D
+    /*Initialize DMA2D GPU*/
+    lv_gpu_stm32_dma2d_init();
+#endif
+
     _lv_ll_init(&LV_GC_ROOT(_lv_obj_style_trans_ll), sizeof(lv_style_trans_t));
     
     _lv_ll_init(&LV_GC_ROOT(_lv_disp_ll), sizeof(lv_disp_t));

src/lv_draw/lv_draw_blend.c

@@ -60,6 +60,10 @@ static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_co
  *  STATIC VARIABLES
  **********************/
 
+#if LV_USE_GPU || LV_USE_GPU_STM32_DMA2D
+LV_ATTRIBUTE_DMA static lv_color_t blend_buf[LV_HOR_RES_MAX];
+#endif
+
 /**********************
  *      MACROS
  **********************/
@@ -338,7 +342,6 @@ LV_ATTRIBUTE_FAST_MEM static void fill_normal(const lv_area_t * disp_area, lv_co
         else {
 #if LV_USE_GPU
             if(disp->driver.gpu_blend_cb && lv_area_get_size(draw_area) > GPU_SIZE_LIMIT) {
-                static lv_color_t blend_buf[LV_HOR_RES_MAX];
                 for(x = 0; x < draw_area_w ; x++) blend_buf[x].full = color.full;
 
                 for(y = draw_area->y1; y <= draw_area->y2; y++) {
@@ -352,7 +355,6 @@ LV_ATTRIBUTE_FAST_MEM static void fill_normal(const lv_area_t * disp_area, lv_co
 
 #if LV_USE_GPU_STM32_DMA2D
             if(lv_area_get_size(draw_area) >= 240) {
-                static lv_color_t blend_buf[LV_HOR_RES_MAX] = {0};
                 if(blend_buf[0].full != color.full) lv_color_fill(blend_buf, color, LV_HOR_RES_MAX);
 
                 lv_coord_t line_h = LV_HOR_RES_MAX / draw_area_w;

src/lv_gpu/lv_gpu_stm32_dma2d.c

@@ -11,19 +11,14 @@
 
 #if LV_USE_GPU_STM32_DMA2D
 
-#if defined(STM32F4)
+#include LV_GPU_DMA2D_CMSIS_INCLUDE
-    #include "stm32f4xx_hal.h"
-#elif defined(STM32F7)
-    #include "stm32f7xx_hal.h"
-#else
-    #error "Not supported STM32 family to use DMA2D"
-#endif
 
 /*********************
  *      DEFINES
  *********************/
 
 #if LV_COLOR_16_SWAP
+    // TODO: F7 has red blue swap bit in control register for all layers and output
     #error "Can't use DMA2D with LV_COLOR_16_SWAP 1"
 #endif
 
@@ -32,11 +27,9 @@
 #endif
 
 #if LV_COLOR_DEPTH == 16
-    #define DMA2D_OUTPUT_FORMAT DMA2D_OUTPUT_RGB565
+    #define DMA2D_COLOR_FORMAT DMA2D_RGB565
-    #define DMA2D_INPUT_FORMAT DMA2D_INPUT_RGB565
 #elif LV_COLOR_DEPTH == 32
-    #define DMA2D_OUTPUT_FORMAT DMA2D_OUTPUT_ARGB8888
+    #define DMA2D_COLOR_FORMAT DMA2D_ARGB8888
-    #define DMA2D_INPUT_FORMAT DMA2D_INPUT_ARGB8888
 #else
     /*Can't use GPU with other formats*/
 #endif
@@ -54,7 +47,6 @@ static void dma2d_wait(void);
 /**********************
  *  STATIC VARIABLES
  **********************/
-static DMA2D_HandleTypeDef hdma2d;
 
 /**********************
  *      MACROS
@@ -64,6 +56,21 @@ static DMA2D_HandleTypeDef hdma2d;
  *   GLOBAL FUNCTIONS
  **********************/
 
+/**
+ * Turn on the peripheral and set output color mode, this only needs to be done once
+ */
+void lv_gpu_stm32_dma2d_init(void)
+{
+    /* Enable DMA2D clock */
+    RCC->AHB1ENR |= RCC_AHB1ENR_DMA2DEN;
+
+    /* Delay after setting peripheral clock */
+    volatile uint32_t temp = RCC->AHB1ENR;
+
+    /* set output colour mode */
+    DMA2D->OPFCCR = DMA2D_COLOR_FORMAT;
+}
+
 /**
  * Fill an area in the buffer with a color
  * @param buf a buffer which should be filled
@@ -77,18 +84,16 @@ void lv_gpu_stm32_dma2d_fill(lv_color_t * buf, lv_coord_t buf_w, lv_color_t colo
 {
     invalidate_cache();
 
-    hdma2d.Instance = DMA2D;
+    DMA2D->CR = 0x30000;
-    hdma2d.Init.Mode = DMA2D_R2M;
+    DMA2D->OMAR = (uint32_t)buf;
-    hdma2d.Init.ColorMode = DMA2D_OUTPUT_FORMAT;
+    /* as input color mode is same as output we don't need to convert here do we? */
-    hdma2d.Init.OutputOffset = buf_w - fill_w;
+    DMA2D->OCOLR = color.full;
-    hdma2d.LayerCfg[1].InputAlpha = DMA2D_NO_MODIF_ALPHA;
+    DMA2D->OOR = buf_w - fill_w;
-    hdma2d.LayerCfg[1].InputColorMode = DMA2D_INPUT_FORMAT;
+    DMA2D->NLR = (fill_w << DMA2D_NLR_PL_Pos) | (fill_h << DMA2D_NLR_NL_Pos);
-    hdma2d.LayerCfg[1].InputOffset = 0;
+
+    /* start transfer */
+    DMA2D->CR |= DMA2D_CR_START_Msk;
 
-    /* DMA2D Initialization */
-    HAL_DMA2D_Init(&hdma2d);
-    HAL_DMA2D_ConfigLayer(&hdma2d, 1);
-    HAL_DMA2D_Start(&hdma2d, (uint32_t)lv_color_to32(color), (uint32_t)buf, fill_w, fill_h);
     dma2d_wait();
 }
 
@@ -106,6 +111,7 @@ void lv_gpu_stm32_dma2d_fill(lv_color_t * buf, lv_coord_t buf_w, lv_color_t colo
 void lv_gpu_stm32_dma2d_fill_mask(lv_color_t * buf, lv_coord_t buf_w, lv_color_t color, const lv_opa_t * mask,
                                   lv_opa_t opa, lv_coord_t fill_w, lv_coord_t fill_h)
 {
+#if 0
     invalidate_cache();
 
     /* Configure the DMA2D Mode, Color Mode and line output offset */
@@ -134,6 +140,7 @@ void lv_gpu_stm32_dma2d_fill_mask(lv_color_t * buf, lv_coord_t buf_w, lv_color_t
     HAL_DMA2D_ConfigLayer(&hdma2d, 1);
     HAL_DMA2D_BlendingStart(&hdma2d, (uint32_t) mask, (uint32_t) buf, (uint32_t)buf, fill_w, fill_h);
     dma2d_wait();
+#endif
 }
 
 /**
@@ -151,22 +158,17 @@ void lv_gpu_stm32_dma2d_copy(lv_color_t * buf, lv_coord_t buf_w, const lv_color_
 {
     invalidate_cache();
 
-    hdma2d.Instance = DMA2D;
+    DMA2D->CR = 0;
-    hdma2d.Init.Mode = DMA2D_M2M;
+    /* copy output colour mode, this register controls both input and output colour format */
-    hdma2d.Init.ColorMode = DMA2D_OUTPUT_FORMAT;
+    DMA2D->FGPFCCR = DMA2D_COLOR_FORMAT;
-    hdma2d.Init.OutputOffset = buf_w - copy_w;
+    DMA2D->FGMAR = (uint32_t)map;
+    DMA2D->FGOR = map_w - copy_w;
+    DMA2D->OMAR = (uint32_t)buf;
+    DMA2D->OOR = buf_w - copy_w;
+    DMA2D->NLR = (copy_w << DMA2D_NLR_PL_Pos) | (copy_h << DMA2D_NLR_NL_Pos);
 
-    /* Foreground layer */
+    /* start transfer */
-    hdma2d.LayerCfg[1].AlphaMode = DMA2D_NO_MODIF_ALPHA;
+    DMA2D->CR |= DMA2D_CR_START_Msk;
-    hdma2d.LayerCfg[1].InputAlpha = 0xFF;
-    hdma2d.LayerCfg[1].InputColorMode = DMA2D_INPUT_FORMAT;
-    hdma2d.LayerCfg[1].InputOffset = map_w - copy_w;
-
-    /* DMA2D Initialization */
-    HAL_DMA2D_Init(&hdma2d);
-    HAL_DMA2D_ConfigLayer(&hdma2d, 0);
-    HAL_DMA2D_ConfigLayer(&hdma2d, 1);
-    HAL_DMA2D_Start(&hdma2d, (uint32_t)map, (uint32_t)buf, copy_w, copy_h);
     dma2d_wait();
 }
 
@@ -185,28 +187,26 @@ void lv_gpu_stm32_dma2d_blend(lv_color_t * buf, lv_coord_t buf_w, const lv_color
                               lv_coord_t map_w, lv_coord_t copy_w, lv_coord_t copy_h)
 {
     invalidate_cache();
+    DMA2D->CR = 0x20000;
 
-    hdma2d.Instance = DMA2D;
+    DMA2D->BGPFCCR = DMA2D_COLOR_FORMAT;
-    hdma2d.Init.Mode = DMA2D_M2M_BLEND;
+    DMA2D->BGMAR = (uint32_t)buf;
-    hdma2d.Init.ColorMode = DMA2D_OUTPUT_FORMAT;
+    DMA2D->BGOR = buf_w - copy_w;
-    hdma2d.Init.OutputOffset = buf_w - copy_w;
 
-    /* Background layer */
+    DMA2D->FGPFCCR = (uint32_t)DMA2D_COLOR_FORMAT
-    hdma2d.LayerCfg[0].AlphaMode = DMA2D_NO_MODIF_ALPHA;
+    /* alpha mode 2, replace with foreground * alpha value */
-    hdma2d.LayerCfg[0].InputColorMode = DMA2D_INPUT_FORMAT;
+    | (2 << DMA2D_FGPFCCR_AM_Pos)
-    hdma2d.LayerCfg[0].InputOffset = buf_w - copy_w;
+    /* alpha value */
+    | (opa << DMA2D_FGPFCCR_ALPHA_Pos);
+    DMA2D->FGMAR = (uint32_t)map;
+    DMA2D->FGOR = map_w - copy_w;
 
-    /* Foreground layer */
+    DMA2D->OMAR = (uint32_t)buf;
-    hdma2d.LayerCfg[1].AlphaMode = DMA2D_COMBINE_ALPHA;
+    DMA2D->OOR = buf_w - copy_w;
-    hdma2d.LayerCfg[1].InputAlpha = opa;
+    DMA2D->NLR = (copy_w << DMA2D_NLR_PL_Pos) | (copy_h << DMA2D_NLR_NL_Pos);
-    hdma2d.LayerCfg[1].InputColorMode = DMA2D_INPUT_FORMAT;
-    hdma2d.LayerCfg[1].InputOffset = map_w - copy_w;
 
-    /* DMA2D Initialization */
+    /* start transfer */
-    HAL_DMA2D_Init(&hdma2d);
+    DMA2D->CR |= DMA2D_CR_START_Msk;
-    HAL_DMA2D_ConfigLayer(&hdma2d, 0);
-    HAL_DMA2D_ConfigLayer(&hdma2d, 1);
-    HAL_DMA2D_BlendingStart(&hdma2d, (uint32_t)map, (uint32_t)buf, (uint32_t)buf, copy_w, copy_h);
     dma2d_wait();
 }
 
@@ -226,7 +226,7 @@ static void invalidate_cache(void)
 static void dma2d_wait(void)
 {
     lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    while(HAL_DMA2D_PollForTransfer(&hdma2d, 0) == HAL_TIMEOUT) {
+    while(DMA2D->CR & DMA2D_CR_START_Msk) {
         if(disp->driver.wait_cb) disp->driver.wait_cb(&disp->driver);
     }
 }

src/lv_gpu/lv_gpu_stm32_dma2d.h

@@ -20,6 +20,12 @@ extern "C" {
  *      DEFINES
  *********************/
 
+#define DMA2D_ARGB8888 0
+#define DMA2D_RGB888 1
+#define DMA2D_RGB565 2
+#define DMA2D_ARGB1555 3
+#define DMA2D_ARGB4444 4
+
 /**********************
  *      TYPEDEFS
  **********************/
@@ -28,6 +34,11 @@ extern "C" {
  * GLOBAL PROTOTYPES
  **********************/
 
+/**
+ * Turn on the peripheral and set output color mode, this only needs to be done once
+ */
+void lv_gpu_stm32_dma2d_init(void);
+
 /**
  * Fill an area in the buffer with a color
  * @param buf a buffer which should be filled