Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-29 22:56:58 +08:00
Code Issues Actions 200 Packages Projects Releases Wiki Activity

dma2d fixes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-04-24 12:08:33 +02:00
parent d98362a60d
commit 5f528d53f1
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lv_draw/lv_draw_img.c
+1 -1
View File
@@ -399,7 +399,7 @@ static void lv_draw_map(const lv_area_t * map_area, const lv_area_t * clip_area,
if(other_mask_cnt == 0 && !transform && !chroma_key && draw_dsc->recolor_opa == LV_OPA_TRANSP && alpha_byte) { if(other_mask_cnt == 0 && !transform && !chroma_key && draw_dsc->recolor_opa == LV_OPA_TRANSP && alpha_byte) {
#if LV_USE_GPU_STM32_DMA2D && LV_COLOR_DEPTH == 32 #if LV_USE_GPU_STM32_DMA2D && LV_COLOR_DEPTH == 32
/*Blend ARGB images directly*/ /*Blend ARGB images directly*/
if(lv_area_get_size(draw_area) > 240) { if(lv_area_get_size(&draw_area) > 240) {
int32_t disp_w = lv_area_get_width(disp_area); int32_t disp_w = lv_area_get_width(disp_area);
lv_color_t * disp_buf = vdb->buf_act; lv_color_t * disp_buf = vdb->buf_act;
lv_color_t * disp_buf_first = disp_buf + disp_w * draw_area.y1 + draw_area.x1; lv_color_t * disp_buf_first = disp_buf + disp_w * draw_area.y1 + draw_area.x1;
src/lv_gpu/lv_gpu_stm32_dma2d.c
+5 -4
View File
@@ -7,6 +7,7 @@
* INCLUDES * INCLUDES
*********************/ *********************/
#include "lv_gpu_stm32_dma2d.h" #include "lv_gpu_stm32_dma2d.h"
#include "../lv_core/lv_refr.h"
#if LV_USE_GPU_STM32_DMA2D #if LV_USE_GPU_STM32_DMA2D
#include "stm32f7xx_hal.h" #include "stm32f7xx_hal.h"
@@ -71,8 +72,8 @@ void lv_gpu_stm32_dma2d_fill(lv_color_t * buf, lv_coord_t buf_w, lv_color_t colo
hdma2d.LayerCfg[1].InputOffset = 0; hdma2d.LayerCfg[1].InputOffset = 0;
/* DMA2D Initialization */ /* DMA2D Initialization */
HAL_DMA2D_Init(&hdma2d) { HAL_DMA2D_Init(&hdma2d);
HAL_DMA2D_ConfigLayer(&hdma2d, 1) HAL_DMA2D_ConfigLayer(&hdma2d, 1);
HAL_DMA2D_Start(&hdma2d, (uint32_t)lv_color_to32(color), (uint32_t)buf, fill_w, fill_h); HAL_DMA2D_Start(&hdma2d, (uint32_t)lv_color_to32(color), (uint32_t)buf, fill_w, fill_h);
dma2d_wait(); dma2d_wait();
} }
@@ -191,7 +192,7 @@ void lv_gpu_stm32_dma2d_blend(lv_color_t * buf, lv_coord_t buf_w, const lv_color
hdma2d.LayerCfg[1].AlphaInverted = DMA2D_REGULAR_ALPHA; hdma2d.LayerCfg[1].AlphaInverted = DMA2D_REGULAR_ALPHA;
/* DMA2D Initialization */ /* DMA2D Initialization */
HAL_DMA2D_Init(&hdma2d); { HAL_DMA2D_Init(&hdma2d);
HAL_DMA2D_ConfigLayer(&hdma2d, 0); HAL_DMA2D_ConfigLayer(&hdma2d, 0);
HAL_DMA2D_ConfigLayer(&hdma2d, 1); HAL_DMA2D_ConfigLayer(&hdma2d, 1);
HAL_DMA2D_BlendingStart(&hdma2d, (uint32_t)map, (uint32_t)buf, (uint32_t)buf, copy_w, copy_h); HAL_DMA2D_BlendingStart(&hdma2d, (uint32_t)map, (uint32_t)buf, (uint32_t)buf, copy_w, copy_h);
@@ -205,7 +206,7 @@ void lv_gpu_stm32_dma2d_blend(lv_color_t * buf, lv_coord_t buf_w, const lv_color
static void dma2d_wait(void) static void dma2d_wait(void)
{ {
lv_disp_t * disp = lv_refr_get_disp_refreshing(); lv_disp_t * disp = lv_refr_get_disp_refreshing();
while(HAL_DMA2D_PollForTransfer(&hdma2d, 0) == HAL_BUSY) { while(HAL_DMA2D_PollForTransfer(&hdma2d, 0) == HAL_TIMEOUT) {
if(disp->driver.wait_cb) disp->driver.wait_cb(&disp->driver); if(disp->driver.wait_cb) disp->driver.wait_cb(&disp->driver);
} }
} }