sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/arm/src/smt32: Kconfig: Select CONFIG_FB_OVERLAY if DMA2D is enabled. Fix some compile issues in stm32_ltdc.c when CONFIG_FB_OVERLAY_BLIT is not enabled.

Browse Source
This commit is contained in:
Gregory Nutt 2018-06-06 13:07:20 -06:00
parent 6230ab01b6
commit c2755517a9
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/stm32/Kconfig
View File

@ -2446,6 +2446,8 @@ config STM32_LTDC
config STM32_DMA2D
bool "DMA2D"
default n
select FB
select FB_OVERLAY
depends on STM32_STM32F429
---help---
The STM32 DMA2D is an Chrom-Art Accelerator for image manipulation

11
arch/arm/src/stm32/stm32_ltdc.c
View File

@ -557,11 +557,10 @@
/* Acceleration support for DMA2D overlays */
#ifdef CONFIG_FB_CMAP
# define DMA2D_ACCL FB_ACCL_BLIT | FB_ACCL_AREA
# define DMA2D_ACCL LTDC_BLIT_ACCL
#else
# define DMA2D_ACCL FB_ACCL_BLIT | FB_ACCL_AREA | \
FB_ACCL_TRANSP | FB_ACCL_COLOR | \
FB_ACCL_BLEND
# define DMA2D_ACCL LTDC_BLIT_ACCL | FB_ACCL_TRANSP | \
FB_ACCL_COLOR | FB_ACCL_BLEND
#endif
/* Helper */
@ -680,9 +679,11 @@ static void stm32_ltdc_linit(uint8_t lid);
#ifdef CONFIG_STM32_DMA2D
static void stm32_ltdc_dma2dlinit(void);
#ifdef CONFIG_FB_OVERLAY_BLIT
static bool stm32_ltdc_lvalidate(FAR const struct stm32_ltdc_s *layer,
FAR const struct fb_area_s *area);
#endif
#endif
#ifdef CONFIG_FB_CMAP
static void stm32_ltdc_lputclut(FAR struct stm32_ltdc_s * layer,
@ -2014,7 +2015,7 @@ static void stm32_ltdc_lclear(uint8_t overlayno)
*
****************************************************************************/
#ifdef CONFIG_STM32_DMA2D
#if defined(CONFIG_STM32_DMA2D) && defined(CONFIG_FB_OVERLAY_BLIT)
static bool stm32_ltdc_lvalidate(FAR const struct stm32_ltdc_s *layer,
FAR const struct fb_area_s *area)
{