chore(core): use internal framebuffer on T3T1 (with ST7789V display c…

…ontroller) [no changelog]
trezor · Jan 2, 2024 · a5afc16 · a5afc16
1 parent c955e66
commit a5afc16
Show file tree

Hide file tree

Showing 21 changed files with 414 additions and 29 deletions.
diff --git a/core/SConscript.bootloader b/core/SConscript.bootloader
@@ -20,7 +20,7 @@ if TREZOR_MODEL in ('1', ):
              )
     Return()
 
-FEATURES_WANTED = ["input", "rgb_led", "consumption_mask", "usb", "optiga"]
+FEATURES_WANTED = ["input", "rgb_led", "consumption_mask", "usb", "optiga", "dma2d"]
 
 CCFLAGS_MOD = ''
 CPPPATH_MOD = []

diff --git a/core/embed/boardloader/memory_stm32u58.ld b/core/embed/boardloader/memory_stm32u58.ld
@@ -92,6 +92,7 @@ SECTIONS {
    __fb_start = .;
     *(.fb1*);
     *(.fb2*);
+    *(.framebuffer_select*);
    __fb_end = .;
     . = ALIGN(4);
   } >SRAM3

diff --git a/core/embed/bootloader/memory_stm32u58.ld b/core/embed/bootloader/memory_stm32u58.ld
@@ -93,6 +93,7 @@ SECTIONS {
    __fb_start = .;
     *(.fb1*);
     *(.fb2*);
+    *(.framebuffer_select*);
    __fb_end = .;
     . = ALIGN(4);
   } >SRAM3

diff --git a/core/embed/firmware/memory_T3T1.ld b/core/embed/firmware/memory_T3T1.ld
@@ -104,6 +104,7 @@ SECTIONS {
    __fb_start = .;
     *(.fb1*);
     *(.fb2*);
+    *(.framebuffer_select*);
    __fb_end = .;
     . = ALIGN(4);
   } >SRAM3

diff --git a/core/embed/lib/display_interface.h b/core/embed/lib/display_interface.h
@@ -58,6 +58,7 @@ void display_init(void);
 void display_reinit(void);
 void display_sync(void);
 void display_refresh(void);
+void display_finish_actions(void);
 const char *display_save(const char *prefix);
 void display_clear_save(void);
 

diff --git a/core/embed/prodtest/memory_stm32u58.ld b/core/embed/prodtest/memory_stm32u58.ld
@@ -108,6 +108,7 @@ SECTIONS {
    __fb_start = .;
     *(.fb1*);
     *(.fb2*);
+    *(.framebuffer_select*);
    __fb_end = .;
     . = ALIGN(4);
   } >SRAM3

diff --git a/core/embed/reflash/memory_stm32u58.ld b/core/embed/reflash/memory_stm32u58.ld
@@ -109,6 +109,7 @@ SECTIONS {
    __fb_start = .;
     *(.fb1*);
     *(.fb2*);
+    *(.framebuffer_select*);
    __fb_end = .;
     . = ALIGN(4);
   } >SRAM3

diff --git a/core/embed/rust/src/trezorhal/display.rs b/core/embed/rust/src/trezorhal/display.rs
@@ -89,7 +89,11 @@ pub fn text_baseline(font: i32) -> i16 {
 }
 
 #[inline(always)]
-#[cfg(all(feature = "disp_i8080_16bit_dw", not(feature = "disp_i8080_8bit_dw")))]
+#[cfg(all(
+    not(feature = "framebuffer"),
+    feature = "disp_i8080_16bit_dw",
+    not(feature = "disp_i8080_8bit_dw")
+))]
 pub fn pixeldata(c: u16) {
     unsafe {
         ffi::DISPLAY_DATA_ADDRESS.write_volatile(c);
@@ -102,7 +106,7 @@ pub fn get_fb_addr() -> FrameBuffer {
 }
 
 #[inline(always)]
-#[cfg(feature = "disp_i8080_8bit_dw")]
+#[cfg(all(not(feature = "framebuffer"), feature = "disp_i8080_8bit_dw"))]
 pub fn pixeldata(c: u16) {
     unsafe {
         ffi::DISPLAY_DATA_ADDRESS.write_volatile((c & 0xff) as u8);
@@ -135,7 +139,10 @@ pub fn pixel(fb: FrameBuffer, x: i16, y: i16, c: u32) {
 }
 
 #[inline(always)]
-#[cfg(not(any(feature = "disp_i8080_16bit_dw", feature = "disp_i8080_8bit_dw")))]
+#[cfg(any(
+    feature = "framebuffer",
+    not(any(feature = "disp_i8080_16bit_dw", feature = "disp_i8080_8bit_dw"))
+))]
 pub fn pixeldata(c: u16) {
     unsafe {
         ffi::display_pixeldata(c);

diff --git a/core/embed/trezorhal/boards/trezor_t3t1_v4.h b/core/embed/trezorhal/boards/trezor_t3t1_v4.h
@@ -22,6 +22,10 @@
 #define DISPLAY_IDENTIFY 1
 #define DISPLAY_TE_PORT GPIOD
 #define DISPLAY_TE_PIN GPIO_PIN_12
+#define DISPLAY_TE_INTERRUPT_HANDLER EXTI12_IRQHandler
+#define DISPLAY_TE_INTERRUPT_NUM EXTI12_IRQn
+#define DISPLAY_TE_INTERRUPT_GPIOSEL EXTI_GPIOD
+#define DISPLAY_TE_INTERRUPT_EXTI_LINE EXTI_LINE_12
 
 #define DISPLAY_PANEL_INIT_SEQ lx154a2422_init_seq
 #define DISPLAY_PANEL_ROTATE lx154a2422_rotate

diff --git a/core/embed/trezorhal/stm32f4/backlight_pwm.c b/core/embed/trezorhal/stm32f4/backlight_pwm.c
@@ -22,6 +22,8 @@ int backlight_pwm_set(int val) {
   return BACKLIGHT;
 }
 
+int backlight_pwm_get(void) { return BACKLIGHT; }
+
 void backlight_pwm_init(void) {
   // init peripherals
   BACKLIGHT_PWM_PORT_CLK_EN();

diff --git a/core/embed/trezorhal/stm32f4/common.c b/core/embed/trezorhal/stm32f4/common.c
@@ -221,6 +221,7 @@ void collect_hw_entropy(void) {
 // which might be incompatible with the other layers older versions,
 // where this setting might be unknown
 void ensure_compatible_settings(void) {
+  display_finish_actions();
 #ifdef TREZOR_MODEL_T
   display_set_big_endian();
   display_orientation(0);

diff --git a/core/embed/trezorhal/stm32f4/displays/ltdc.c b/core/embed/trezorhal/stm32f4/displays/ltdc.c
@@ -415,3 +415,5 @@ void display_shift_window(uint16_t pixels) {
 uint16_t display_get_window_offset(void) {
   return MAX_DISPLAY_RESX - display_get_window_width();
 }
+
+void display_finish_actions(void) {}