chore(color): reduce busy wait time on LCD refresh (#7483)

This commit is contained in:
philmoz
2026-07-22 09:38:29 +10:00
committed by GitHub
parent 19aa6d5f20
commit 50d12c7cea
19 changed files with 230 additions and 380 deletions
+51 -53
View File
@@ -32,6 +32,7 @@
#include "lcd.h"
#include <lvgl/lvgl.h>
#include <vector>
#if defined(RADIO_T18)
#define HBP 43
@@ -60,17 +61,29 @@ static void* initialFrameBuffer = nullptr;
#if LCD_VERTICAL_INVERT
typedef uint16_t pixel_t;
static pixel_t _LCD_BUF_1[DISPLAY_BUFFER_SIZE] __SDRAM;
static pixel_t _LCD_BUF_2[DISPLAY_BUFFER_SIZE] __SDRAM;
static pixel_t _line_buffer[LCD_W];
static pixel_t _LCD_BUF_1[DISPLAY_BUFFER_SIZE] __SDRAM __ALIGNED(64);
#if defined(RADIO_F16)
// F16 can be either normal or inverted
static pixel_t _LCD_BUF_2[DISPLAY_BUFFER_SIZE] __SDRAM __ALIGNED(64);
#else
// LVGL will only use one buffer when display is inverted so reuse 2nd
// buffer here
extern pixel_t LCD_SECOND_FRAME_BUFFER[DISPLAY_BUFFER_SIZE];
#define _LCD_BUF_2 LCD_SECOND_FRAME_BUFFER
#endif
// Frame buffer pointers
static uint16_t* _front_buffer = _LCD_BUF_1;
static uint16_t* _back_buffer = _LCD_BUF_2;
// Vector to save areas that need to be copied from front buffer to back buffer
static std::vector<lv_area_t> dma_areas;
// Copy 2 pixels at once to speed up a little
static void _copy_rotate_180(uint16_t* dst, uint16_t* src, const rect_t& copy_area)
{
static pixel_t _line_buffer[LCD_W];
coord_t x1 = LCD_W - copy_area.w - copy_area.x;
coord_t y1 = LCD_H - copy_area.h - copy_area.y;
@@ -106,50 +119,44 @@ static void _copy_rotate_180(uint16_t* dst, uint16_t* src, const rect_t& copy_ar
dst -= LCD_W;
}
}
static void _rotate_area_180(lv_area_t& area)
{
lv_coord_t tmp_coord;
tmp_coord = area.y2;
area.y2 = LCD_H - area.y1 - 1;
area.y1 = LCD_H - tmp_coord - 1;
tmp_coord = area.x2;
area.x2 = LCD_W - area.x1 - 1;
area.x1 = LCD_W - tmp_coord - 1;
}
#endif
static volatile uint8_t _frame_addr_reloaded = 0;
static void _update_frame_buffer_addr(uint16_t* addr)
{
LTDC_Layer1->CFBAR = (uint32_t)addr;
// reload shadow registers on vertical blank
_frame_addr_reloaded = 0;
LTDC->SRCR = LTDC_SRCR_VBR;
// wait for reload
// TODO: replace through some smarter mechanism without busy wait
while(_frame_addr_reloaded == 0);
__HAL_LTDC_ENABLE_IT(&hltdc, LTDC_IT_LI);
}
static void startLcdRefresh(lv_disp_drv_t *disp_drv, uint16_t *buffer,
const rect_t &copy_area)
{
#if LCD_VERTICAL_INVERT
#if defined(RADIO_F16)
if(hardwareOptions.pcbrev > 0) {
// Direct mode
if (disp_drv->direct_mode) {
// Direct mode / not inverted
_update_frame_buffer_addr(buffer);
} else
#endif
{
return;
}
// Copy areas that were updated last frame to the back buffer
if (dma_areas.size() > 0) {
for (auto a: dma_areas) {
DMACopyBitmap(_back_buffer, LCD_W, LCD_H, a.x1, a.y1,
_front_buffer, LCD_W, LCD_H, a.x1, a.y1,
a.x2 - a.x1 + 1, a.y2 - a.y1 + 1);
}
dma_areas.clear();
DMAWait();
}
// Copy changes from LVGL to LCD back buffer with 180 degree rotation
_copy_rotate_180(_back_buffer, buffer, copy_area);
// Check for last LVGL update before we need to swap buffers
if (lv_disp_flush_is_last(disp_drv)) {
// swap back/front
// swap back/front buffers
if (_front_buffer == _LCD_BUF_1) {
_front_buffer = _LCD_BUF_2;
_back_buffer = _LCD_BUF_1;
@@ -161,30 +168,22 @@ static void startLcdRefresh(lv_disp_drv_t *disp_drv, uint16_t *buffer,
// Trigger async refresh
_update_frame_buffer_addr(_front_buffer);
// Copy refreshed & rotated areas into new back buffer
uint16_t* src = _front_buffer;
uint16_t* dst = _back_buffer;
// Save areas that need to be updated next time around
lv_disp_t* disp = _lv_refr_get_disp_refreshing();
for(int i = 0; i < disp->inv_p; i++) {
if(disp->inv_area_joined[i]) continue;
// Rotate area 180 degrees
lv_area_t refr_area;
lv_area_copy(&refr_area, &disp->inv_areas[i]);
refr_area.x1 = LCD_W - disp->inv_areas[i].x2 - 1;
refr_area.x2 = LCD_W - disp->inv_areas[i].x1 - 1;
refr_area.y1 = LCD_H - disp->inv_areas[i].y2 - 1;
refr_area.y2 = LCD_H - disp->inv_areas[i].y1 - 1;
// TRACE("Vert invert refresh {%d,%d,%d,%d}", refr_area.x1,
// refr_area.y1, refr_area.x2 - refr_area.x1 + 1, refr_area.y2 - refr_area.y1 + 1);
_rotate_area_180(refr_area);
auto area_w = refr_area.x2 - refr_area.x1 + 1;
auto area_h = refr_area.y2 - refr_area.y1 + 1;
DMACopyBitmap(dst, LCD_W, LCD_H, refr_area.x1, refr_area.y1,
src, LCD_W, LCD_H, refr_area.x1, refr_area.y1,
area_w, area_h);
dma_areas.push_back(refr_area);
}
}
} else {
lv_disp_flush_ready(disp_drv);
}
#else
// Direct mode
@@ -337,7 +336,6 @@ void LCD_Init_LTDC()
// Trigger on last line
HAL_LTDC_ProgramLineEvent(&hltdc, LCD_PHYS_H);
__HAL_LTDC_ENABLE_IT(&hltdc, LTDC_IT_LI);
#if 0
DMA2D_ITConfig(DMA2D_CR_TCIE, ENABLE);
@@ -425,8 +423,8 @@ void lcdInit()
{
#if LCD_VERTICAL_INVERT
// Clear buffer first
memset(_LCD_BUF_1, 0, sizeof(_LCD_BUF_1));
memset(_LCD_BUF_2, 0, sizeof(_LCD_BUF_2));
memset(_LCD_BUF_1, 0, DISPLAY_BUFFER_SIZE * sizeof(pixel_t));
memset(_LCD_BUF_2, 0, DISPLAY_BUFFER_SIZE * sizeof(pixel_t));
#endif
// Initialize the LCD
@@ -439,11 +437,11 @@ void lcdInit()
lcdSetFlushCb(startLcdRefresh);
}
extern "C" void LTDC_IRQHandler(void)
{
// clear interrupt flag
__HAL_LTDC_CLEAR_FLAG(&hltdc, LTDC_FLAG_LI);
_frame_addr_reloaded = 1;
}
__HAL_LTDC_DISABLE_IT(&hltdc, LTDC_IT_LI);
lcdFlushed();
}
+3 -10
View File
@@ -36,24 +36,17 @@
static LTDC_HandleTypeDef hltdc;
static void* initialFrameBuffer = nullptr;
static volatile uint8_t _frame_addr_reloaded = 0;
static void startLcdRefresh(lv_disp_drv_t* disp_drv, uint16_t* buffer,
const rect_t& copy_area)
{
(void)disp_drv;
(void)copy_area;
LTDC_Layer1->CFBAR &= ~(LTDC_LxCFBAR_CFBADD);
LTDC_Layer1->CFBAR = (uint32_t)buffer;
// reload shadow registers on vertical blank
_frame_addr_reloaded = 0;
LTDC->SRCR = LTDC_SRCR_VBR;
__HAL_LTDC_ENABLE_IT(&hltdc, LTDC_IT_LI);
// wait for reload
// TODO: replace through some smarter mechanism without busy wait
while (_frame_addr_reloaded == 0);
__HAL_LTDC_ENABLE_IT(&hltdc, LTDC_IT_LI);
}
uint32_t lcdPixelClock;
@@ -389,7 +382,6 @@ void LCD_Init_LTDC()
// Trigger on last line
HAL_LTDC_ProgramLineEvent(&hltdc, LCD_W);
__HAL_LTDC_ENABLE_IT(&hltdc, LTDC_IT_LI);
}
void LCD_LayerInit()
@@ -466,5 +458,6 @@ extern "C" void LTDC_IRQHandler(void)
{
__HAL_LTDC_CLEAR_FLAG(&hltdc, LTDC_FLAG_LI);
__HAL_LTDC_DISABLE_IT(&hltdc, LTDC_IT_LI);
_frame_addr_reloaded = 1;
lcdFlushed();
}
+2
View File
@@ -120,6 +120,8 @@ static void startLcdRefresh(lv_disp_drv_t *disp_drv, uint16_t *buffer,
set_row_addr(y1, y2);
memory_write(buffer, copy_area.w * copy_area.h);
lcdFlushed();
}
lcdSpiInitFucPtr lcdInitFunction;
+3 -11
View File
@@ -40,24 +40,17 @@ static void* initialFrameBuffer = nullptr;
#define GPIO_AF_LTDC GPIO_AF14
static volatile uint8_t _frame_addr_reloaded = 0;
static void startLcdRefresh(lv_disp_drv_t *disp_drv, uint16_t *buffer,
const rect_t &copy_area)
{
(void)disp_drv;
(void)copy_area;
LTDC_Layer1->CFBAR &= ~(LTDC_LxCFBAR_CFBADD);
LTDC_Layer1->CFBAR = (uint32_t)buffer;
// reload shadow registers on vertical blank
_frame_addr_reloaded = 0;
LTDC->SRCR = LTDC_SRCR_VBR;
__HAL_LTDC_ENABLE_IT(&hltdc, LTDC_IT_LI);
// wait for reload
// TODO: replace through some smarter mechanism without busy wait
while(_frame_addr_reloaded == 0);
__HAL_LTDC_ENABLE_IT(&hltdc, LTDC_IT_LI);
}
lcdSpiInitFucPtr lcdInitFunction;
@@ -2763,7 +2756,6 @@ void LCD_Init_LTDC() {
// Trigger on last line
HAL_LTDC_ProgramLineEvent(&hltdc, lcd_phys_h);
__HAL_LTDC_ENABLE_IT(&hltdc, LTDC_IT_LI);
}
void LCD_LayerInit() {
@@ -2887,6 +2879,6 @@ extern "C" void LTDC_IRQHandler(void)
{
__HAL_LTDC_CLEAR_FLAG(&hltdc, LTDC_FLAG_LI);
__HAL_LTDC_DISABLE_IT(&hltdc, LTDC_IT_LI);
_frame_addr_reloaded = 1;
}
lcdFlushed();
}
+2 -2
View File
@@ -84,7 +84,6 @@ rotenc_t rotaryEncoderGetValue()
extern const etx_hal_adc_driver_t simu_adc_driver;
void lcdCopy(void * dest, void * src);
void lcdFlushed();
#if defined(AUX_SERIAL) || defined(AUX2_SERIAL)
static void hostSerialInit();
@@ -733,7 +732,8 @@ void simuLuaReloadPermanentScripts()
void simuLcdFlushed()
{
::lcdFlushed();
if (simu_running)
lcdFlushed();
}
uint8_t simuGetMaxTrainerChannels()
+2 -10
View File
@@ -40,8 +40,6 @@ static volatile uint16_t lcd_phys_h = LCD_PHYS_H;
static LTDC_HandleTypeDef hltdc;
static void* initialFrameBuffer = nullptr;
static volatile uint8_t _frame_addr_reloaded = 0;
static void startLcdRefresh(lv_disp_drv_t *disp_drv, uint16_t *buffer,
const rect_t &copy_area)
{
@@ -53,16 +51,10 @@ static void startLcdRefresh(lv_disp_drv_t *disp_drv, uint16_t *buffer,
SCB_CleanDCache();
LTDC_Layer1->CFBAR = (uint32_t)buffer;
// reload shadow registers on vertical blank
_frame_addr_reloaded = 0;
LTDC->SRCR = LTDC_SRCR_VBR;
__HAL_LTDC_ENABLE_IT(&hltdc, LTDC_IT_LI);
// wait for reload
// TODO: replace through some smarter mechanism without busy wait
while(_frame_addr_reloaded == 0);
}
lcdSpiInitFucPtr lcdInitFunction;
@@ -2760,7 +2752,6 @@ void LCD_Init_LTDC() {
// Trigger on last line
HAL_LTDC_ProgramLineEvent(&hltdc, lcd_phys_h);
__HAL_LTDC_ENABLE_IT(&hltdc, LTDC_IT_LI);
}
void LCD_LayerInit() {
@@ -2885,5 +2876,6 @@ extern "C" void LTDC_IRQHandler(void)
{
__HAL_LTDC_CLEAR_FLAG(&hltdc, LTDC_FLAG_LI);
__HAL_LTDC_DISABLE_IT(&hltdc, LTDC_IT_LI);
_frame_addr_reloaded = 1;
lcdFlushed();
}
+2 -10
View File
@@ -417,8 +417,6 @@ extern "C" void backlightInit()
LPTIMx_PWM_Init(&hlcd_lptim);
}
static volatile uint8_t _frame_addr_reloaded = 0;
static void startLcdRefresh(lv_disp_drv_t *disp_drv, uint16_t *buffer,
const rect_t &copy_area)
{
@@ -427,18 +425,11 @@ static void startLcdRefresh(lv_disp_drv_t *disp_drv, uint16_t *buffer,
SCB_CleanDCache();
LTDC_Layer1->CFBAR &= ~(LTDC_LxCFBAR_CFBADD);
LTDC_Layer1->CFBAR = (uint32_t)buffer;
// reload shadow registers on vertical blank
_frame_addr_reloaded = 0;
LTDC->SRCR = LTDC_SRCR_VBR;
__HAL_LTDC_ENABLE_IT(&hlcd_ltdc, LTDC_IT_LI);
// wait for reload
// TODO: replace through some smarter mechanism without busy wait
while(_frame_addr_reloaded == 0);
}
extern "C" void lcdSetInitalFrameBuffer(void* fbAddress)
@@ -460,5 +451,6 @@ extern "C" void LTDC_IRQHandler(void)
// clear interrupt flag
__HAL_LTDC_CLEAR_FLAG(&hlcd_ltdc, LTDC_FLAG_LI);
__HAL_LTDC_DISABLE_IT(&hlcd_ltdc, LTDC_IT_LI);
_frame_addr_reloaded = 1;
lcdFlushed();
}
-1
View File
@@ -312,7 +312,6 @@ void lcdSetInvert(bool invert);
#ifdef __cplusplus
void lcdSetContrast(bool useDefault = false);
#endif
void lcdFlushed();
// Top LCD driver
#if defined(TOPLCD_GPIO)