From 9684f34b089f5ef85d6ff99dbedb9b4ae17580c1 Mon Sep 17 00:00:00 2001 From: liukangcc Date: Thu, 11 Nov 2021 13:32:48 +0800 Subject: [PATCH] [update] add dma for lvgl. --- .../board/ports/lvgl/SConscript | 4 +- .../board/ports/lvgl/lv_conf.h | 7 +- .../board/ports/lvgl/lv_port_disp.c | 266 +++++++++--------- 3 files changed, 143 insertions(+), 134 deletions(-) diff --git a/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/SConscript b/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/SConscript index cb74975f3..1c37d7668 100644 --- a/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/SConscript +++ b/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/SConscript @@ -5,5 +5,7 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('LVGL-port', src, depend = ['BSP_USING_LVGL'], CPPPATH = CPPPATH) +CPPDEFINES = ['STM32F4'] + +group = DefineGroup('LVGL-port', src, depend = ['BSP_USING_LVGL'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_conf.h b/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_conf.h index ac9f12680..05ff957d4 100644 --- a/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_conf.h +++ b/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_conf.h @@ -11,7 +11,10 @@ #ifndef LV_CONF_H #define LV_CONF_H -#define LV_USE_PERF_MONITOR 1 -#define LV_COLOR_DEPTH 32 +#define LV_USE_PERF_MONITOR 1 +#define LV_COLOR_DEPTH 32 + +#define LV_USE_GPU_STM32_DMA2D 1 +#define LV_GPU_DMA2D_CMSIS_INCLUDE "stm32f469xx.h" #endif diff --git a/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_port_disp.c b/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_port_disp.c index c8f1a4823..9d8bd029e 100644 --- a/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_port_disp.c +++ b/bsp/stm32/stm32f469-st-disco/board/ports/lvgl/lv_port_disp.c @@ -10,6 +10,10 @@ #include #include +//#define DRV_DEBUG +#define LOG_TAG "lvgl.disp" +#include + /*A static or global variable to store the buffers*/ static lv_disp_draw_buf_t disp_buf; @@ -18,184 +22,184 @@ static struct rt_device_graphic_info info; static lv_disp_drv_t disp_drv; /*Descriptor of a display driver*/ -typedef struct +static DMA_HandleTypeDef DmaHandle; +#define DMA_STREAM DMA2_Stream0 +#define DMA_CHANNEL DMA_CHANNEL_0 +#define DMA_STREAM_IRQ DMA2_Stream0_IRQn +#define DMA_STREAM_IRQHANDLER DMA2_Stream0_IRQHandler + +static int32_t x1_flush; +static int32_t y1_flush; +static int32_t x2_flush; +static int32_t y2_fill; +static int32_t y_fill_act; +static const lv_color_t * buf_to_flush; +/** + * @brief DMA conversion complete callback + * @note This function is executed when the transfer complete interrupt + * is generated + * @retval None + */ +static void DMA_TransferComplete(DMA_HandleTypeDef *han) { - uint8_t blue; - uint8_t green; - uint8_t red; -} lv_color24_t; + y_fill_act ++; -static void color_to16_maybe(lv_color16_t *dst, lv_color_t *src) -{ -#if (LV_COLOR_DEPTH == 16) - dst->full = src->full; -#else - dst->ch.blue = src->ch.blue; - dst->ch.green = src->ch.green; - dst->ch.red = src->ch.red; -#endif + if(y_fill_act > y2_fill) + { + lv_disp_flush_ready(&disp_drv); + } + else + { + buf_to_flush += (x2_flush - x1_flush + 1); + /*##-7- Start the DMA transfer using the interrupt mode ####################*/ + /* Configure the source, destination and buffer size DMA fields and Start DMA Stream transfer */ + /* Enable All the DMA interrupts */ + if (HAL_DMA_Start_IT(han,(uint32_t)buf_to_flush, + (uint32_t)&((uint32_t *)info.framebuffer)[y_fill_act * info.width + x1_flush], + (x2_flush - x1_flush + 1)) != HAL_OK) + { + LOG_E("HAL_DMA_Start_IT error"); + while(1); /*Halt on error*/ + } + } } -static void color_to24(lv_color24_t *dst, lv_color_t *src) +/** + * @brief DMA conversion error callback + * @note This function is executed when the transfer error interrupt + * is generated during DMA transfer + * @retval None + */ +static void DMA_TransferError(DMA_HandleTypeDef *han) { - dst->blue = src->ch.blue; - dst->green = src->ch.green; - dst->red = src->ch.red; + LOG_E("dma transfer error"); + while(1); } -/*Flush the content of the internal buffer the specific area on the display - *You can use DMA or any hardware acceleration to do this operation in the background but - *'lv_disp_flush_ready()' has to be called when finished.*/ -static void lcd_fb_flush(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p) +/** + * @brief This function handles DMA Stream interrupt request. + * @param None + * @retval None + */ +void DMA_STREAM_IRQHANDLER(void) { - int x1, x2, y1, y2; - - x1 = area->x1; - x2 = area->x2; - y1 = area->y1; - y2 = area->y2; - - /*Return if the area is out the screen*/ - if (x2 < 0) - return; - if (y2 < 0) - return; - if (x1 > info.width - 1) - return; - if (y1 > info.height - 1) - return; - - /*Truncate the area to the screen*/ - int32_t act_x1 = x1 < 0 ? 0 : x1; - int32_t act_y1 = y1 < 0 ? 0 : y1; - int32_t act_x2 = x2 > info.width - 1 ? info.width - 1 : x2; - int32_t act_y2 = y2 > info.height - 1 ? info.height - 1 : y2; - - uint32_t x; - uint32_t y; - long int location = 0; + rt_interrupt_enter(); + HAL_DMA_IRQHandler(&DmaHandle); + rt_interrupt_leave(); +} - /* 8 bit per pixel */ - if (info.bits_per_pixel == 8) +static void DMA_Config(void) +{ + /*## -1- Enable DMA2 clock #################################################*/ + __HAL_RCC_DMA2_CLK_ENABLE(); + + /*##-2- Select the DMA functional Parameters ###############################*/ + DmaHandle.Init.Channel = DMA_CHANNEL; /* DMA_CHANNEL_0 */ + DmaHandle.Init.Direction = DMA_MEMORY_TO_MEMORY; /* M2M transfer mode */ + DmaHandle.Init.PeriphInc = DMA_PINC_ENABLE; /* Peripheral increment mode Enable */ + DmaHandle.Init.MemInc = DMA_MINC_ENABLE; /* Memory increment mode Enable */ + DmaHandle.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD; /* Peripheral data alignment : 32bit */ + DmaHandle.Init.MemDataAlignment = DMA_PDATAALIGN_WORD; /* memory data alignment : 32bit */ + DmaHandle.Init.Mode = DMA_NORMAL; /* Normal DMA mode */ + DmaHandle.Init.Priority = DMA_PRIORITY_HIGH; /* priority level : high */ + DmaHandle.Init.FIFOMode = DMA_FIFOMODE_ENABLE; /* FIFO mode enabled */ + DmaHandle.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_1QUARTERFULL; /* FIFO threshold: 1/4 full */ + DmaHandle.Init.MemBurst = DMA_MBURST_SINGLE; /* Memory burst */ + DmaHandle.Init.PeriphBurst = DMA_PBURST_SINGLE; /* Peripheral burst */ + + DmaHandle.Instance = DMA_STREAM; + + if (HAL_DMA_Init(&DmaHandle) != HAL_OK) { - uint8_t *fbp8 = (uint8_t *)info.framebuffer; - //TODO color convert maybe - for (y = act_y1; y <= act_y2; y++) - { - for (x = act_x1; x <= act_x2; x++) - { - location = (x) + (y)*info.width; - fbp8[location] = color_p->full; - color_p++; - } - - color_p += x2 - act_x2; - } + while(1); } - /* 16 bit per pixel */ - else if (info.bits_per_pixel == 16) - { - lv_color16_t *fbp16 = (lv_color16_t *)info.framebuffer; - - for (y = act_y1; y <= act_y2; y++) - { - for (x = act_x1; x <= act_x2; x++) - { - location = (x) + (y)*info.width; - color_to16_maybe(&fbp16[location], color_p); - color_p++; - } - - color_p += x2 - act_x2; - } - } + HAL_DMA_RegisterCallback(&DmaHandle, HAL_DMA_XFER_CPLT_CB_ID, DMA_TransferComplete); + HAL_DMA_RegisterCallback(&DmaHandle, HAL_DMA_XFER_ERROR_CB_ID, DMA_TransferError); - /* 24 bit per pixel */ - else if (info.bits_per_pixel == 24) - { - lv_color24_t *fbp24 = (lv_color24_t *)info.framebuffer; + HAL_NVIC_SetPriority(DMA_STREAM_IRQ, 0, 0); + HAL_NVIC_EnableIRQ(DMA_STREAM_IRQ); +} - for (y = act_y1; y <= act_y2; y++) - { - for (x = act_x1; x <= act_x2; x++) - { - location = (x) + (y)*info.width; - color_to24(&fbp24[location], color_p); - color_p++; - } - - color_p += x2 - act_x2; - } - } +static void lcd_fb_flush(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p) +{ + /*Return if the area is out the screen*/ + if (area->x2 < 0) return; + if (area->y2 < 0) return; + if (area->x1 > info.width - 1) return; + if (area->y1 > info.height - 1) return; - /* 32 bit per pixel */ - else if (info.bits_per_pixel == 32) + /*Truncate the area to the screen*/ + int32_t act_x1 = area->x1 < 0 ? 0 : area->x1; + int32_t act_y1 = area->y1 < 0 ? 0 : area->y1; + int32_t act_x2 = area->x2 > info.width - 1 ? info.width - 1 : area->x2; + int32_t act_y2 = area->y2 > info.height - 1 ? info.height - 1 : area->y2; + + x1_flush = act_x1; + y1_flush = act_y1; + x2_flush = act_x2; + y2_fill = act_y2; + y_fill_act = act_y1; + buf_to_flush = color_p; + + if (HAL_DMA_Start_IT(&DmaHandle,(uint32_t)buf_to_flush, + (uint32_t)&((uint32_t *)info.framebuffer)[y_fill_act * info.width + x1_flush], + (x2_flush - x1_flush + 1)) != HAL_OK) { - uint32_t *fbp32 = (uint32_t *)info.framebuffer; - //TODO - for (y = act_y1; y <= act_y2; y++) - { - for (x = act_x1; x <= act_x2; x++) - { - location = (x) + (y)*info.width; - fbp32[location] = color_p->full; - color_p++; - } - - color_p += x2 - act_x2; - } + LOG_E("dma start it error"); + while(1); } - - struct rt_device_rect_info rect_info; - - rect_info.x = x1; - rect_info.y = y1; - rect_info.width = x2 - x1 + 1; - rect_info.height = y2 - y1 + 1; - rt_device_control(lcd_device, RTGRAPHIC_CTRL_RECT_UPDATE, &rect_info); - - lv_disp_flush_ready(disp_drv); } void lv_port_disp_init(void) { rt_err_t result; - lv_color_t *fbuf; + void* buf_1 = RT_NULL; + void* buf_2 = RT_NULL; lcd_device = rt_device_find("lcd"); if (lcd_device == 0) { - rt_kprintf("error!\n"); + LOG_E("error!"); return; } result = rt_device_open(lcd_device, 0); if (result != RT_EOK) { - rt_kprintf("error!\n"); + LOG_E("error!"); return; } + /* get framebuffer address */ result = rt_device_control(lcd_device, RTGRAPHIC_CTRL_GET_INFO, &info); if (result != RT_EOK) { - rt_kprintf("error!\n"); + LOG_E("error!"); /* get device information failed */ return; } - RT_ASSERT(info.bits_per_pixel == 8 || info.bits_per_pixel == 16 || + RT_ASSERT (info.bits_per_pixel == 8 || info.bits_per_pixel == 16 || info.bits_per_pixel == 24 || info.bits_per_pixel == 32); - fbuf = rt_malloc(info.width * info.height / 10); - if (!fbuf) + DMA_Config(); + + buf_1 = rt_malloc(info.width * 40 * sizeof(lv_color_t)); + if (buf_1 == RT_NULL) + { + LOG_E("malloc memory failed"); + return; + } + + buf_2 = rt_malloc(info.width * 40 * sizeof(lv_color_t)); + if (buf_2 == RT_NULL) { - rt_kprintf("Error: alloc disp buf fail\n"); + LOG_E("malloc memory failed"); return; } - /*Initialize `disp_buf` with the buffer(s). With only one buffer use NULL instead buf_2 */ - lv_disp_draw_buf_init(&disp_buf, fbuf, RT_NULL, info.width * 10); + /*Initialize `disp_buf` with the buffer(s).*/ + lv_disp_draw_buf_init(&disp_buf, buf_1, buf_2, info.width * 40); lv_disp_drv_init(&disp_drv); /*Basic initialization*/ -- GitLab