From 36433c2144e2738314399105d5866dcd8970d9c0 Mon Sep 17 00:00:00 2001 From: Themba Dube Date: Mon, 24 Aug 2020 07:36:44 -0400 Subject: [PATCH] Rename function to `lv_disp_clean_dcache` and use currently refreshing display --- src/lv_core/lv_disp.c | 6 +++--- src/lv_core/lv_disp.h | 4 ++-- src/lv_gpu/lv_gpu_stm32_dma2d.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lv_core/lv_disp.c b/src/lv_core/lv_disp.c index 0cdb7dc28..2b24c1d0b 100644 --- a/src/lv_core/lv_disp.c +++ b/src/lv_core/lv_disp.c @@ -353,14 +353,14 @@ void lv_disp_trig_activity(lv_disp_t * disp) } /** - * Invalidate any CPU cache that is related to the display. + * Clean any CPU cache that is related to the display. * @param disp pointer to an display (NULL to use the default display) */ -void lv_disp_invalidate_cache(lv_disp_t * disp) +void lv_disp_clean_dcache(lv_disp_t * disp) { if(!disp) disp = lv_disp_get_default(); if(!disp) { - LV_LOG_WARN("lv_disp_invalidate_cache: no display registered"); + LV_LOG_WARN("lv_disp_clean_dcache: no display registered"); return; } diff --git a/src/lv_core/lv_disp.h b/src/lv_core/lv_disp.h index 8eb571d38..3083c46d2 100644 --- a/src/lv_core/lv_disp.h +++ b/src/lv_core/lv_disp.h @@ -134,10 +134,10 @@ uint32_t lv_disp_get_inactive_time(const lv_disp_t * disp); void lv_disp_trig_activity(lv_disp_t * disp); /** - * Invalidate any CPU cache that is related to the display. + * Clean any CPU cache that is related to the display. * @param disp pointer to an display (NULL to use the default display) */ -void lv_disp_invalidate_cache(lv_disp_t * disp); +void lv_disp_clean_dcache(lv_disp_t * disp); /** * Get a pointer to the screen refresher task to diff --git a/src/lv_gpu/lv_gpu_stm32_dma2d.c b/src/lv_gpu/lv_gpu_stm32_dma2d.c index 0e09016e7..205b3d645 100644 --- a/src/lv_gpu/lv_gpu_stm32_dma2d.c +++ b/src/lv_gpu/lv_gpu_stm32_dma2d.c @@ -82,7 +82,7 @@ void lv_gpu_stm32_dma2d_init(void) */ void lv_gpu_stm32_dma2d_fill(lv_color_t * buf, lv_coord_t buf_w, lv_color_t color, lv_coord_t fill_w, lv_coord_t fill_h) { - lv_disp_invalidate_cache(NULL); + lv_disp_clean_dcache(_lv_refr_get_disp_refreshing()); DMA2D->CR = 0x30000; DMA2D->OMAR = (uint32_t)buf; @@ -112,7 +112,7 @@ void lv_gpu_stm32_dma2d_fill_mask(lv_color_t * buf, lv_coord_t buf_w, lv_color_t lv_opa_t opa, lv_coord_t fill_w, lv_coord_t fill_h) { #if 0 - lv_disp_invalidate_cache(NULL); + lv_disp_clean_dcache(_lv_refr_get_disp_refreshing()); /* Configure the DMA2D Mode, Color Mode and line output offset */ hdma2d.Init.Mode = DMA2D_M2M_BLEND; @@ -156,7 +156,7 @@ void lv_gpu_stm32_dma2d_fill_mask(lv_color_t * buf, lv_coord_t buf_w, lv_color_t void lv_gpu_stm32_dma2d_copy(lv_color_t * buf, lv_coord_t buf_w, const lv_color_t * map, lv_coord_t map_w, lv_coord_t copy_w, lv_coord_t copy_h) { - lv_disp_invalidate_cache(NULL); + lv_disp_clean_dcache(_lv_refr_get_disp_refreshing()); DMA2D->CR = 0; /* copy output colour mode, this register controls both input and output colour format */ @@ -186,7 +186,7 @@ void lv_gpu_stm32_dma2d_copy(lv_color_t * buf, lv_coord_t buf_w, const lv_color_ void lv_gpu_stm32_dma2d_blend(lv_color_t * buf, lv_coord_t buf_w, const lv_color_t * map, lv_opa_t opa, lv_coord_t map_w, lv_coord_t copy_w, lv_coord_t copy_h) { - lv_disp_invalidate_cache(NULL); + lv_disp_clean_dcache(_lv_refr_get_disp_refreshing()); DMA2D->CR = 0x20000; DMA2D->BGPFCCR = LV_DMA2D_COLOR_FORMAT;