From f387e1af371d7c811ee042dfe79ad509a65f3475 Mon Sep 17 00:00:00 2001
From: Gabor Kiss-Vamosi <kisvegabor@gmail.com>
Date: Fri, 8 May 2020 11:53:40 +0200
Subject: [PATCH] dma2d fixes for F4

---
 lv_conf_template.h              |  2 +-
 src/lv_conf_internal.h          |  2 +-
 src/lv_gpu/lv_gpu_stm32_dma2d.c | 16 ++++++----------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lv_conf_template.h b/lv_conf_template.h
index 645166674..e3a80a6f9 100644
--- a/lv_conf_template.h
+++ b/lv_conf_template.h
@@ -176,7 +176,7 @@ typedef void * lv_group_user_data_t;
 #endif  /*LV_USE_GROUP*/
 
 /* 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
 
 /* 1: Enable file system (might be required for images */
diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h
index 0c0a54180..daf6ff4c9 100644
--- a/src/lv_conf_internal.h
+++ b/src/lv_conf_internal.h
@@ -261,7 +261,7 @@
 
 /* 1: Enable GPU interface*/
 #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
 #ifndef LV_USE_GPU_STM32_DMA2D
 #define LV_USE_GPU_STM32_DMA2D  0
diff --git a/src/lv_gpu/lv_gpu_stm32_dma2d.c b/src/lv_gpu/lv_gpu_stm32_dma2d.c
index c7b130e5f..6fbf06f8c 100644
--- a/src/lv_gpu/lv_gpu_stm32_dma2d.c
+++ b/src/lv_gpu/lv_gpu_stm32_dma2d.c
@@ -10,7 +10,12 @@
 #include "../lv_core/lv_refr.h"
 
 #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
@@ -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].InputColorMode = DMA2D_INPUT_FORMAT;
     hdma2d.LayerCfg[1].InputOffset = map_w - copy_w;
-#ifndef STM32F746G_DISCO
-    hdma2d.LayerCfg[1].AlphaInverted = DMA2D_REGULAR_ALPHA;
-#endif
 
     /* DMA2D Initialization */
     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].InputColorMode = DMA2D_INPUT_FORMAT;
     hdma2d.LayerCfg[0].InputOffset = buf_w - copy_w;
-#ifndef STM32F746G_DISCO
-    hdma2d.LayerCfg[0].AlphaInverted = DMA2D_REGULAR_ALPHA;
-#endif
 
     /* Foreground layer */
     hdma2d.LayerCfg[1].AlphaMode = DMA2D_COMBINE_ALPHA;
     hdma2d.LayerCfg[1].InputAlpha = opa;
     hdma2d.LayerCfg[1].InputColorMode = DMA2D_INPUT_FORMAT;
     hdma2d.LayerCfg[1].InputOffset = map_w - copy_w;
-#ifndef STM32F746G_DISCO
-    hdma2d.LayerCfg[1].AlphaInverted = DMA2D_REGULAR_ALPHA;
-#endif
 
     /* DMA2D Initialization */
     HAL_DMA2D_Init(&hdma2d);