fix(core): fix gfx_bitblt initialization

[no changelog]
trezor · Jan 17, 2025 · 046d9ca · 046d9ca
1 parent d4cd1a3
commit 046d9ca
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 6 deletions.
diff --git a/core/embed/io/display/ltdc_dsi/display_driver.c b/core/embed/io/display/ltdc_dsi/display_driver.c
@@ -412,6 +412,8 @@ bool display_init(display_content_mode_t mode) {
 
   __HAL_LTDC_ENABLE_IT(&drv->hlcd_ltdc, LTDC_IT_LI | LTDC_IT_FU | LTDC_IT_TE);
 
+  gfx_bitblt_init();
+
   drv->initialized = true;
   return true;
 
@@ -427,6 +429,8 @@ void display_deinit(display_content_mode_t mode) {
 
   GPIO_InitTypeDef GPIO_InitStructure = {0};
 
+  gfx_bitblt_deinit();
+
   NVIC_DisableIRQ(LTDC_IRQn);
   NVIC_DisableIRQ(LTDC_ER_IRQn);
 

diff --git a/core/embed/io/display/st-7789/display_driver.c b/core/embed/io/display/st-7789/display_driver.c
@@ -89,6 +89,8 @@ bool display_init(display_content_mode_t mode) {
 #endif
 #endif
 
+  gfx_bitblt_init();
+
   drv->initialized = true;
   return true;
 }
@@ -110,6 +112,8 @@ void display_deinit(display_content_mode_t mode) {
 #endif
 #endif
 
+  gfx_bitblt_deinit();
+
   mpu_set_active_fb(NULL, 0);
 
   backlight_pwm_deinit(mode == DISPLAY_RESET_CONTENT ? BACKLIGHT_RESET

diff --git a/core/embed/io/display/stm32f429i-disc1/display_driver.c b/core/embed/io/display/stm32f429i-disc1/display_driver.c
@@ -67,13 +67,17 @@ bool display_init(display_content_mode_t mode) {
     ili9341_init();
   }
 
+  gfx_bitblt_init();
+
   drv->initialized = true;
   return true;
 }
 
 void display_deinit(display_content_mode_t mode) {
   display_driver_t *drv = &g_display_driver;
 
+  gfx_bitblt_deinit();
+
   mpu_set_active_fb(NULL, 0);
 
   drv->initialized = false;

diff --git a/core/embed/io/display/unix/display_driver.c b/core/embed/io/display/unix/display_driver.c
@@ -178,6 +178,9 @@ bool display_init(display_content_mode_t mode) {
 #else
   drv->orientation_angle = 0;
 #endif
+
+  gfx_bitblt_init();
+
   drv->initialized = true;
   return true;
 }
@@ -189,6 +192,8 @@ void display_deinit(display_content_mode_t mode) {
     return;
   }
 
+  gfx_bitblt_deinit();
+
   SDL_FreeSurface(drv->prev_saved);
   SDL_FreeSurface(drv->buffer);
   if (drv->background != NULL) {

diff --git a/core/embed/io/display/vg-2864/display_driver.c b/core/embed/io/display/vg-2864/display_driver.c
@@ -318,6 +318,8 @@ bool display_init(display_content_mode_t mode) {
     display_init_spi(drv);
   }
 
+  gfx_bitblt_init();
+
   drv->initialized = true;
   return true;
 }
@@ -327,6 +329,8 @@ void display_deinit(display_content_mode_t mode) {
 
   mpu_set_active_fb(NULL, 0);
 
+  gfx_bitblt_deinit();
+
   drv->initialized = false;
 }
 

diff --git a/core/embed/projects/boardloader/main.c b/core/embed/projects/boardloader/main.c
@@ -92,7 +92,6 @@ static void drivers_init(void) {
 #ifdef USE_HASH_PROCESSOR
   hash_processor_init();
 #endif
-  gfx_bitblt_init();
   display_init(DISPLAY_RESET_CONTENT);
 #ifdef USE_SD_CARD
   sdcard_init();
@@ -103,7 +102,6 @@ static void drivers_deinit(void) {
 #ifdef FIXED_HW_DEINIT
   // TODO
 #endif
-  gfx_bitblt_deinit();
   display_deinit(DISPLAY_JUMP_BEHAVIOR);
 #ifdef USE_POWERCTL
   powerctl_deinit();

diff --git a/core/embed/projects/bootloader/main.c b/core/embed/projects/bootloader/main.c
@@ -98,7 +98,6 @@ static void drivers_init(secbool *touch_initialized) {
 #ifdef USE_HASH_PROCESSOR
   hash_processor_init();
 #endif
-  gfx_bitblt_init();
   display_init(DISPLAY_JUMP_BEHAVIOR);
   unit_properties_init();
 
@@ -138,7 +137,6 @@ static void drivers_deinit(void) {
   button_deinit();
 #endif
 #endif
-  gfx_bitblt_deinit();
   display_deinit(DISPLAY_JUMP_BEHAVIOR);
 }
 

diff --git a/core/embed/projects/kernel/main.c b/core/embed/projects/kernel/main.c
@@ -116,8 +116,6 @@ void drivers_init() {
   hash_processor_init();
 #endif
 
-  gfx_bitblt_init();
-
   display_init(DISPLAY_JUMP_BEHAVIOR);
 
 #ifdef USE_OEM_KEYS_CHECK