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

fix(st-dma2d): remove unused functions (#5561)

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2024-02-07 09:26:46 +01:00
committed by GitHub
parent 099f0cd805
commit 949c2fdda0
2 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.c
View File

@@ -34,10 +34,6 @@
#error "Cannot use DMA2D with LV_COLOR_DEPTH other than 16 or 32" #error "Cannot use DMA2D with LV_COLOR_DEPTH other than 16 or 32"
#endif #endif
#if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
#define LV_STM32_DMA2D_USE_M7_CACHE
#endif
#if defined (LV_STM32_DMA2D_USE_M7_CACHE) #if defined (LV_STM32_DMA2D_USE_M7_CACHE)
// Cortex-M7 DCache present // Cortex-M7 DCache present
#define __lv_gpu_stm32_dma2d_clean_cache(address, offset, width, height, pixel_size) _lv_gpu_stm32_dma2d_clean_cache(address, offset, width, height, pixel_size) #define __lv_gpu_stm32_dma2d_clean_cache(address, offset, width, height, pixel_size) _lv_gpu_stm32_dma2d_clean_cache(address, offset, width, height, pixel_size)
@@ -59,8 +55,7 @@ static void lv_draw_stm32_dma2d_img_decoded(lv_draw_ctx_t * draw_ctx, const lv_d
static dma2d_color_format_t lv_color_format_to_dma2d_color_format(lv_img_cf_t color_format); static dma2d_color_format_t lv_color_format_to_dma2d_color_format(lv_img_cf_t color_format);
static lv_point_t lv_area_get_offset(const lv_area_t * area1, const lv_area_t * area2); static lv_point_t lv_area_get_offset(const lv_area_t * area1, const lv_area_t * area2);
LV_STM32_DMA2D_STATIC void lv_gpu_stm32_dma2d_wait_cb(lv_draw_ctx_t * draw_ctx); lv_res_t lv_draw_stm32_dma2d_img(lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * img_dsc,
LV_STM32_DMA2D_STATIC lv_res_t lv_draw_stm32_dma2d_img(lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * img_dsc,
const lv_area_t * src_area, const void * src); const lv_area_t * src_area, const void * src);
LV_STM32_DMA2D_STATIC void _lv_draw_stm32_dma2d_blend_fill(const lv_color_t * dst_buf, lv_coord_t dst_stride, LV_STM32_DMA2D_STATIC void _lv_draw_stm32_dma2d_blend_fill(const lv_color_t * dst_buf, lv_coord_t dst_stride,
const lv_area_t * draw_area, lv_color_t color, lv_opa_t opa); const lv_area_t * draw_area, lv_color_t color, lv_opa_t opa);
@@ -70,18 +65,9 @@ LV_STM32_DMA2D_STATIC void _lv_draw_stm32_dma2d_blend_map(const lv_color_t * des
LV_STM32_DMA2D_STATIC void _lv_draw_stm32_dma2d_blend_paint(const lv_color_t * dst_buf, lv_coord_t dst_stride, LV_STM32_DMA2D_STATIC void _lv_draw_stm32_dma2d_blend_paint(const lv_color_t * dst_buf, lv_coord_t dst_stride,
const lv_area_t * draw_area, const lv_opa_t * mask_buf, lv_coord_t mask_stride, const lv_point_t * mask_offset, const lv_area_t * draw_area, const lv_opa_t * mask_buf, lv_coord_t mask_stride, const lv_point_t * mask_offset,
lv_color_t color, lv_opa_t opa); lv_color_t color, lv_opa_t opa);
LV_STM32_DMA2D_STATIC void _lv_draw_stm32_dma2d_copy_buffer(const lv_color_t * dest_buf, lv_coord_t dest_stride,
const lv_area_t * draw_area, const lv_color_t * src_buf, lv_coord_t src_stride, const lv_point_t * src_offset);
LV_STM32_DMA2D_STATIC void _lv_gpu_stm32_dma2d_await_dma_transfer_finish(lv_disp_drv_t * disp_drv); LV_STM32_DMA2D_STATIC void _lv_gpu_stm32_dma2d_await_dma_transfer_finish(lv_disp_drv_t * disp_drv);
LV_STM32_DMA2D_STATIC void _lv_gpu_stm32_dma2d_start_dma_transfer(void); LV_STM32_DMA2D_STATIC void _lv_gpu_stm32_dma2d_start_dma_transfer(void);
#if defined (LV_STM32_DMA2D_USE_M7_CACHE)
LV_STM32_DMA2D_STATIC void _lv_gpu_stm32_dma2d_invalidate_cache(uint32_t address, lv_coord_t offset,
lv_coord_t width, lv_coord_t height, uint8_t pixel_size);
LV_STM32_DMA2D_STATIC void _lv_gpu_stm32_dma2d_clean_cache(uint32_t address, lv_coord_t offset, lv_coord_t width,
lv_coord_t height, uint8_t pixel_size);
#endif
#if defined(LV_STM32_DMA2D_TEST) #if defined(LV_STM32_DMA2D_TEST)
LV_STM32_DMA2D_STATIC bool _lv_gpu_stm32_dwt_init(void); LV_STM32_DMA2D_STATIC bool _lv_gpu_stm32_dwt_init(void);
LV_STM32_DMA2D_STATIC void _lv_gpu_stm32_dwt_reset(void); LV_STM32_DMA2D_STATIC void _lv_gpu_stm32_dwt_reset(void);
@@ -127,8 +113,6 @@ void lv_draw_stm32_dma2d_ctx_init(lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx)
dma2d_draw_ctx->blend = lv_draw_stm32_dma2d_blend; dma2d_draw_ctx->blend = lv_draw_stm32_dma2d_blend;
dma2d_draw_ctx->base_draw.draw_img_decoded = lv_draw_stm32_dma2d_img_decoded; dma2d_draw_ctx->base_draw.draw_img_decoded = lv_draw_stm32_dma2d_img_decoded;
//dma2d_draw_ctx->base_draw.draw_img = lv_draw_stm32_dma2d_img; //dma2d_draw_ctx->base_draw.draw_img = lv_draw_stm32_dma2d_img;
// Note: currently it does not make sense use lv_gpu_stm32_dma2d_wait_cb() since waiting starts right after the dma2d transfer
//dma2d_draw_ctx->base_draw.wait_for_finish = lv_gpu_stm32_dma2d_wait_cb;
dma2d_draw_ctx->base_draw.buffer_copy = lv_draw_stm32_dma2d_buffer_copy; dma2d_draw_ctx->base_draw.buffer_copy = lv_draw_stm32_dma2d_buffer_copy;
} }
@@ -330,7 +314,7 @@ static dma2d_color_format_t lv_color_format_to_dma2d_color_format(lv_img_cf_t co
} }
} }
LV_STM32_DMA2D_STATIC lv_res_t lv_draw_stm32_dma2d_img(lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * img_dsc, lv_res_t lv_draw_stm32_dma2d_img(lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * img_dsc,
const lv_area_t * src_area, const void * src) const lv_area_t * src_area, const void * src)
{ {
//if(lv_img_src_get_type(src) != LV_IMG_SRC_VARIABLE) return LV_RES_INV; //if(lv_img_src_get_type(src) != LV_IMG_SRC_VARIABLE) return LV_RES_INV;
@@ -368,13 +352,6 @@ LV_STM32_DMA2D_STATIC lv_res_t lv_draw_stm32_dma2d_img(lv_draw_ctx_t * draw_ctx,
return LV_RES_OK; return LV_RES_OK;
} }
LV_STM32_DMA2D_STATIC void lv_gpu_stm32_dma2d_wait_cb(lv_draw_ctx_t * draw_ctx)
{
lv_disp_t * disp = _lv_refr_get_disp_refreshing();
_lv_gpu_stm32_dma2d_await_dma_transfer_finish(disp->driver);
lv_draw_sw_wait_for_finish(draw_ctx);
}
/********************** /**********************
* STATIC FUNCTIONS * STATIC FUNCTIONS
**********************/ **********************/
@@ -603,7 +580,7 @@ LV_STM32_DMA2D_STATIC void _lv_draw_stm32_dma2d_blend_paint(const lv_color_t * d
* @brief Copies src (foreground) map to the dst (background) map. * @brief Copies src (foreground) map to the dst (background) map.
* @param src_offset src offset in relation to dst, useful when src is larger than draw_area * @param src_offset src offset in relation to dst, useful when src is larger than draw_area
*/ */
LV_STM32_DMA2D_STATIC void _lv_draw_stm32_dma2d_copy_buffer(const lv_color_t * dest_buf, lv_coord_t dest_stride, void _lv_draw_stm32_dma2d_copy_buffer(const lv_color_t * dest_buf, lv_coord_t dest_stride,
const lv_area_t * draw_area, const lv_color_t * src_buf, lv_coord_t src_stride, const lv_point_t * src_offset) const lv_area_t * draw_area, const lv_color_t * src_buf, lv_coord_t src_stride, const lv_point_t * src_offset)
{ {
LV_ASSERT_MSG(!isDma2dInProgess, "dma2d transfer has not finished"); // critical LV_ASSERT_MSG(!isDma2dInProgess, "dma2d transfer has not finished"); // critical
@@ -686,7 +663,7 @@ LV_STM32_DMA2D_STATIC void _lv_gpu_stm32_dma2d_await_dma_transfer_finish(lv_disp
#if defined (LV_STM32_DMA2D_USE_M7_CACHE) #if defined (LV_STM32_DMA2D_USE_M7_CACHE)
// Cortex-M7 DCache present // Cortex-M7 DCache present
LV_STM32_DMA2D_STATIC void _lv_gpu_stm32_dma2d_invalidate_cache(uint32_t address, lv_coord_t offset, lv_coord_t width, void _lv_gpu_stm32_dma2d_invalidate_cache(uint32_t address, lv_coord_t offset, lv_coord_t width,
lv_coord_t height, uint8_t pixel_size) lv_coord_t height, uint8_t pixel_size)
{ {
if(((SCB->CCR) & SCB_CCR_DC_Msk) == 0) return; // L1 data cache is disabled if(((SCB->CCR) & SCB_CCR_DC_Msk) == 0) return; // L1 data cache is disabled
@@ -716,7 +693,7 @@ LV_STM32_DMA2D_STATIC void _lv_gpu_stm32_dma2d_invalidate_cache(uint32_t address
__ISB(); __ISB();
} }
LV_STM32_DMA2D_STATIC void _lv_gpu_stm32_dma2d_clean_cache(uint32_t address, lv_coord_t offset, lv_coord_t width, void _lv_gpu_stm32_dma2d_clean_cache(uint32_t address, lv_coord_t offset, lv_coord_t width,
lv_coord_t height, uint8_t pixel_size) lv_coord_t height, uint8_t pixel_size)
{ {
if(((SCB->CCR) & SCB_CCR_DC_Msk) == 0) return; // L1 data cache is disabled if(((SCB->CCR) & SCB_CCR_DC_Msk) == 0) return; // L1 data cache is disabled
@@ -793,4 +770,4 @@ LV_STM32_DMA2D_STATIC void _lv_gpu_stm32_dwt_reset(void)
DWT->CYCCNT = 0; DWT->CYCCNT = 0;
} }
#endif // LV_STM32_DMA2D_TEST #endif // LV_STM32_DMA2D_TEST
#endif // LV_USE_GPU_STM32_DMA2D #endif // LV_USE_GPU_STM32_DMA2D

14
src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.h
View File

@@ -31,6 +31,10 @@ extern "C" {
#define LV_STM32_DMA2D_STATIC static #define LV_STM32_DMA2D_STATIC static
#endif #endif
#if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
#define LV_STM32_DMA2D_USE_M7_CACHE
#endif
/********************** /**********************
* TYPEDEFS * TYPEDEFS
**********************/ **********************/
@@ -53,6 +57,16 @@ struct _lv_disp_drv_t;
void lv_draw_stm32_dma2d_init(void); void lv_draw_stm32_dma2d_init(void);
void lv_draw_stm32_dma2d_ctx_init(struct _lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx); void lv_draw_stm32_dma2d_ctx_init(struct _lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx);
void lv_draw_stm32_dma2d_ctx_deinit(struct _lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx); void lv_draw_stm32_dma2d_ctx_deinit(struct _lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx);
void _lv_draw_stm32_dma2d_copy_buffer(const lv_color_t * dest_buf, lv_coord_t dest_stride,
const lv_area_t * draw_area, const lv_color_t * src_buf, lv_coord_t src_stride, const lv_point_t * src_offset);
#if defined (LV_STM32_DMA2D_USE_M7_CACHE)
void _lv_gpu_stm32_dma2d_invalidate_cache(uint32_t address, lv_coord_t offset,
lv_coord_t width, lv_coord_t height, uint8_t pixel_size);
void _lv_gpu_stm32_dma2d_clean_cache(uint32_t address, lv_coord_t offset, lv_coord_t width,
lv_coord_t height, uint8_t pixel_size);
#endif
/********************** /**********************
* MACROS * MACROS