arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-05-27 11:18:51 +00:00
Code Issues Releases Wiki Activity

fix(core): fix old frame flicker when backlight is risen too soon

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2024-05-06 11:35:16 +02:00 committed by TychoVrahe
parent a86f3604ca
commit 751390ec08
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/embed/trezorhal/stm32f4/xdisplay/st-7789/display_driver.c
View File

@ -89,10 +89,9 @@ void display_finish_actions(void) {
int display_set_backlight(int level) { int display_set_backlight(int level) {
#ifdef XFRAMEBUFFER #ifdef XFRAMEBUFFER
#ifndef BOARDLOADER #ifndef BOARDLOADER
// wait for DMA transfer to finish before changing backlight // if turning on the backlight, wait until the panel is refreshed
// so that we know that panel has current data if (backlight_pwm_get() < level && !is_mode_handler()) {
if (backlight_pwm_get() != level && !is_mode_handler()) { display_ensure_refreshed();
bg_copy_wait();
} }
#endif #endif
#endif #endif

24
core/embed/trezorhal/stm32f4/xdisplay/st-7789/display_fb.c
View File

@ -63,7 +63,8 @@ void display_physical_fb_clear(void) {
} }
#ifndef BOARDLOADER #ifndef BOARDLOADER
static bool pending_fb_switch = false; static volatile bool pending_fb_switch = false;
static volatile uint32_t last_fb_update_time = 0;
#endif #endif
#ifndef BOARDLOADER #ifndef BOARDLOADER
@ -82,6 +83,7 @@ void DISPLAY_TE_INTERRUPT_HANDLER(void) {
} }
pending_fb_switch = false; pending_fb_switch = false;
last_fb_update_time = HAL_GetTick();
__HAL_GPIO_EXTI_CLEAR_FLAG(DISPLAY_TE_PIN); __HAL_GPIO_EXTI_CLEAR_FLAG(DISPLAY_TE_PIN);
} }
@ -93,7 +95,7 @@ static void wait_for_fb_switch(void) {
} }
#endif #endif
static void copy_fb_to_display(uint16_t *fb) { static void copy_fb_to_display(const uint16_t *fb) {
for (int i = 0; i < DISPLAY_RESX * DISPLAY_RESY; i++) { for (int i = 0; i < DISPLAY_RESX * DISPLAY_RESY; i++) {
// 2 bytes per pixel because we're using RGB 5-6-5 format // 2 bytes per pixel because we're using RGB 5-6-5 format
ISSUE_PIXEL_DATA(fb[i]); ISSUE_PIXEL_DATA(fb[i]);
@ -122,7 +124,7 @@ static void switch_fb_manually(void) {
} }
#ifndef BOARDLOADER #ifndef BOARDLOADER
static void switch_fb_in_backround(void) { static void switch_fb_in_background(void) {
if (current_frame_buffer == 0) { if (current_frame_buffer == 0) {
current_frame_buffer = 1; current_frame_buffer = 1;
@ -169,7 +171,7 @@ void display_refresh(void) {
if (is_mode_handler()) { if (is_mode_handler()) {
switch_fb_manually(); switch_fb_manually();
} else { } else {
switch_fb_in_backround(); switch_fb_in_background();
} }
#else #else
display_panel_set_window(0, 0, DISPLAY_RESX - 1, DISPLAY_RESY - 1); display_panel_set_window(0, 0, DISPLAY_RESX - 1, DISPLAY_RESY - 1);
@ -177,6 +179,20 @@ void display_refresh(void) {
#endif #endif
} }
void display_ensure_refreshed(void) {
#ifndef BOARDLOADER
if (!is_mode_handler()) {
wait_for_fb_switch();
// the update time is collected after starting the BG copy, then we need to
// wait: for the bg copy to finish and for at least one full refresh cycle
// before we can consider the display fully redrawn
while (HAL_GetTick() - last_fb_update_time < 40) {
__WFI();
}
}
#endif
}
void display_fill(const gfx_bitblt_t *bb) { void display_fill(const gfx_bitblt_t *bb) {
display_fb_info_t fb = display_get_frame_buffer(); display_fb_info_t fb = display_get_frame_buffer();

2
core/embed/trezorhal/stm32f4/xdisplay/st-7789/display_fb.h
View File

@ -27,6 +27,8 @@
// Clears both physical frame buffers // Clears both physical frame buffers
void display_physical_fb_clear(void); void display_physical_fb_clear(void);
void display_ensure_refreshed(void);
#endif // XFRAMEBUFFER #endif // XFRAMEBUFFER
#endif // TREZORHAL_DISPLAY_FB_H #endif // TREZORHAL_DISPLAY_FB_H