github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dma2d fixes for F4

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-05-08 11:53:40 +02:00
parent 2b9608d128
commit f387e1af37
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lv_conf_template.h
View File

@@ -176,7 +176,7 @@ typedef void * lv_group_user_data_t;
#endif /*LV_USE_GROUP*/ #endif /*LV_USE_GROUP*/
/* 1: Enable GPU interface*/ /* 1: Enable GPU interface*/
#define LV_USE_GPU 1 #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 #define LV_USE_GPU_STM32_DMA2D 0
/* 1: Enable file system (might be required for images */ /* 1: Enable file system (might be required for images */

2
src/lv_conf_internal.h
View File

@@ -261,7 +261,7 @@
/* 1: Enable GPU interface*/ /* 1: Enable GPU interface*/
#ifndef LV_USE_GPU #ifndef LV_USE_GPU
#define LV_USE_GPU 1 #define LV_USE_GPU 1 /*Only enables `gpu_fill_cb` and `gpu_blend_cb` in the disp. drv- */
#endif #endif
#ifndef LV_USE_GPU_STM32_DMA2D #ifndef LV_USE_GPU_STM32_DMA2D
#define LV_USE_GPU_STM32_DMA2D 0 #define LV_USE_GPU_STM32_DMA2D 0

16
src/lv_gpu/lv_gpu_stm32_dma2d.c
View File

@@ -10,7 +10,12 @@
#include "../lv_core/lv_refr.h" #include "../lv_core/lv_refr.h"
#if LV_USE_GPU_STM32_DMA2D #if LV_USE_GPU_STM32_DMA2D
#include "stm32f7xx_hal.h"
#if defined(STM32F4)
#include "stm32f4xx_hal.h"
#elif defiend(STM32F7)
#include "stm32f4xx_hal.h"
#endif
/********************* /*********************
* DEFINES * DEFINES
@@ -154,9 +159,6 @@ void lv_gpu_stm32_dma2d_copy(lv_color_t * buf, lv_coord_t buf_w, const lv_color_
hdma2d.LayerCfg[1].InputAlpha = 0xFF; hdma2d.LayerCfg[1].InputAlpha = 0xFF;
hdma2d.LayerCfg[1].InputColorMode = DMA2D_INPUT_FORMAT; hdma2d.LayerCfg[1].InputColorMode = DMA2D_INPUT_FORMAT;
hdma2d.LayerCfg[1].InputOffset = map_w - copy_w; hdma2d.LayerCfg[1].InputOffset = map_w - copy_w;
#ifndef STM32F746G_DISCO
hdma2d.LayerCfg[1].AlphaInverted = DMA2D_REGULAR_ALPHA;
#endif
/* DMA2D Initialization */ /* DMA2D Initialization */
HAL_DMA2D_Init(&hdma2d); HAL_DMA2D_Init(&hdma2d);
@@ -191,18 +193,12 @@ void lv_gpu_stm32_dma2d_blend(lv_color_t * buf, lv_coord_t buf_w, const lv_color
hdma2d.LayerCfg[0].AlphaMode = DMA2D_NO_MODIF_ALPHA; hdma2d.LayerCfg[0].AlphaMode = DMA2D_NO_MODIF_ALPHA;
hdma2d.LayerCfg[0].InputColorMode = DMA2D_INPUT_FORMAT; hdma2d.LayerCfg[0].InputColorMode = DMA2D_INPUT_FORMAT;
hdma2d.LayerCfg[0].InputOffset = buf_w - copy_w; hdma2d.LayerCfg[0].InputOffset = buf_w - copy_w;
#ifndef STM32F746G_DISCO
hdma2d.LayerCfg[0].AlphaInverted = DMA2D_REGULAR_ALPHA;
#endif
/* Foreground layer */ /* Foreground layer */
hdma2d.LayerCfg[1].AlphaMode = DMA2D_COMBINE_ALPHA; hdma2d.LayerCfg[1].AlphaMode = DMA2D_COMBINE_ALPHA;
hdma2d.LayerCfg[1].InputAlpha = opa; hdma2d.LayerCfg[1].InputAlpha = opa;
hdma2d.LayerCfg[1].InputColorMode = DMA2D_INPUT_FORMAT; hdma2d.LayerCfg[1].InputColorMode = DMA2D_INPUT_FORMAT;
hdma2d.LayerCfg[1].InputOffset = map_w - copy_w; hdma2d.LayerCfg[1].InputOffset = map_w - copy_w;
#ifndef STM32F746G_DISCO
hdma2d.LayerCfg[1].AlphaInverted = DMA2D_REGULAR_ALPHA;
#endif
/* DMA2D Initialization */ /* DMA2D Initialization */
HAL_DMA2D_Init(&hdma2d); HAL_DMA2D_Init(&hdma2d);