fix(core): fix dma2d includes and initialization with respect to new rendering

[no changelog]

core/SConscript.bootloader_emu

@@ -158,7 +158,6 @@ SOURCE_TREZORHAL = [
 if NEW_RENDERING:
     SOURCE_TREZORHAL += [
         'embed/trezorhal/unix/display_driver.c',
-        'embed/trezorhal/unix/dma2d_bitblt.c',
         'embed/trezorhal/xdisplay_legacy.c',
     ]
 else:

core/embed/boardloader/main.c

@@ -44,6 +44,14 @@
 #include "hash_processor.h"
 #endif
 
+#ifdef USE_DMA2D
+#ifdef NEW_RENDERING
+#include "dma2d_bitblt.h"
+#else
+#include "dma2d.h"
+#endif
+#endif
+
 #include "lowlevel.h"
 #include "model.h"
 #include "version.h"
@@ -281,6 +289,10 @@ int main(void) {
   hash_processor_init();
 #endif
 
+#ifdef USE_DMA2D
+  dma2d_init();
+#endif
+
   display_init();
   display_clear();
   display_refresh();

core/embed/bootloader/main.c

@@ -35,8 +35,12 @@
 #include "secret.h"
 
 #ifdef USE_DMA2D
+#ifdef NEW_RENDERING
+#include "dma2d_bitblt.h"
+#else
 #include "dma2d.h"
 #endif
+#endif
 #ifdef USE_I2C
 #include "i2c.h"
 #endif

core/embed/firmware/main.c

@@ -60,8 +60,13 @@
 #include "consumption_mask.h"
 #endif
 #ifdef USE_DMA2D
+#ifdef NEW_RENDERING
+#include "dma2d_bitblt.h"
+#else
 #include "dma2d.h"
 #endif
+#endif
+
 #ifdef USE_BUTTON
 #include "button.h"
 #endif

core/embed/trezorhal/dma2d_bitblt.h

@@ -22,6 +22,9 @@
 
 #include "gfx_bitblt.h"
 
+// Initializes DMA2D peripheral
+void dma2d_init(void);
+
 // Waits until any pending DMA2D operation is finished
 void dma2d_wait(void);
 

core/embed/trezorhal/stm32f4/dma2d_bitblt.c

@@ -40,6 +40,8 @@ static inline bool dma2d_accessible(const void* ptr) {
 #endif
 }
 
+void dma2d_init(void) { __HAL_RCC_DMA2D_CLK_ENABLE(); }
+
 void dma2d_wait(void) {
   while (HAL_DMA2D_PollForTransfer(&dma2d_handle, 10) != HAL_OK)
     ;

core/embed/trezorhal/unix/dma2d_bitblt.c

@@ -19,4 +19,6 @@
 
 #include "dma2d_bitblt.h"
 
+void dma2d_init(void) {}
+
 void dma2d_wait(void) {}

core/site_scons/models/D001/discovery.py

@@ -48,8 +48,11 @@ def configure(
         sources += [f"embed/trezorhal/stm32f4/displays/{display}"]
         sources += ["embed/trezorhal/stm32f4/displays/ili9341_spi.c"]
 
-    sources += ["embed/trezorhal/stm32f4/dma2d.c"]
+    if "new_rendering" in features_wanted:
-    sources += ["embed/trezorhal/stm32f4/dma2d_bitblt.c"]
+        sources += ["embed/trezorhal/stm32u5/dma2d_bitblt.c"]
+    else:
+        sources += ["embed/trezorhal/stm32u5/dma2d.c"]
+
     sources += [
         "vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma2d.c"
     ]

core/site_scons/models/D002/discovery2.py

@@ -92,10 +92,10 @@ def configure(
         features_available.append("usb")
 
     defines += ["USE_DMA2D", "FRAMEBUFFER", "FRAMEBUFFER32BIT", "UI_COLOR_32BIT"]
-    sources += [
+    if "new_rendering" in features_wanted:
-        "embed/trezorhal/stm32u5/dma2d.c",
+        sources += ["embed/trezorhal/stm32u5/dma2d_bitblt.c"]
-        "embed/trezorhal/stm32u5/dma2d_bitblt.c",
+    else:
-    ]
+        sources += ["embed/trezorhal/stm32u5/dma2d.c"]
     features_available.append("dma2d")
     features_available.append("framebuffer")
     features_available.append("framebuffer32bit")

core/site_scons/models/T2T1/trezor_t.py

@@ -113,8 +113,10 @@ def configure(
 
     if "dma2d" in features_wanted:
         defines += ["USE_DMA2D"]
-        sources += ["embed/trezorhal/stm32f4/dma2d.c"]
+        if "new_rendering" in features_wanted:
-        sources += ["embed/trezorhal/stm32f4/dma2d_bitblt.c"]
+            sources += ["embed/trezorhal/stm32u5/dma2d_bitblt.c"]
+        else:
+            sources += ["embed/trezorhal/stm32u5/dma2d.c"]
         sources += [
             "vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma2d.c"
         ]

core/site_scons/models/T3T1/trezor_t3t1_revE.py

@@ -114,8 +114,10 @@ def configure(
 
     if "dma2d" in features_wanted:
         defines += ["USE_DMA2D"]
-        sources += ["embed/trezorhal/stm32u5/dma2d.c"]
+        if "new_rendering" in features_wanted:
             sources += ["embed/trezorhal/stm32u5/dma2d_bitblt.c"]
+        else:
+            sources += ["embed/trezorhal/stm32u5/dma2d.c"]
         features_available.append("dma2d")
 
     if "optiga" in features_wanted:

core/site_scons/models/T3T1/trezor_t3t1_v4.py

@@ -115,8 +115,10 @@ def configure(
 
     if "dma2d" in features_wanted:
         defines += ["USE_DMA2D"]
-        sources += ["embed/trezorhal/stm32u5/dma2d.c"]
+        if "new_rendering" in features_wanted:
             sources += ["embed/trezorhal/stm32u5/dma2d_bitblt.c"]
+        else:
+            sources += ["embed/trezorhal/stm32u5/dma2d.c"]
         features_available.append("dma2d")
 
     if "optiga" in features_wanted: