Review fixes

Author: ppsx

ports/espressif/boards/waveshare_esp32_s3_amoled_241/mpconfigboard.h

@@ -11,9 +11,9 @@
 #define CIRCUITPY_BOARD_I2C         (0)
 #define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO48, .sda = &pin_GPIO47}}
 
-// Display refresh buffer: 2048 uint32_t words = 8KB on stack.
+// Display refresh buffer: 8192 bytes = 2048 uint32_t words on stack.
 // ESP32-S3 main task stack is 24KB; verified safe with this board.
-#define CIRCUITPY_DISPLAY_AREA_BUFFER_SIZE (2048)
+#define CIRCUITPY_DISPLAY_AREA_BUFFER_SIZE (8192)
 
 // AMOLED Display (displayio + qspibus path) - initialized in board_init()
 #define CIRCUITPY_BOARD_DISPLAY      (1)

py/circuitpy_mpconfig.h

@@ -394,11 +394,11 @@ typedef long mp_off_t;
 #define CIRCUITPY_DISPLAY_LIMIT (1)
 #endif
 
-// Display area buffer size in uint32_t words for _refresh_area() VLA.
+// Display area buffer size in bytes for _refresh_area() VLA.
 // Allocated on stack; boards with larger displays can override per-board.
-// Default 128 words = 512 bytes.
+// Default 512 bytes = 128 uint32_t words.
 #ifndef CIRCUITPY_DISPLAY_AREA_BUFFER_SIZE
-#define CIRCUITPY_DISPLAY_AREA_BUFFER_SIZE (128)
+#define CIRCUITPY_DISPLAY_AREA_BUFFER_SIZE (512)
 #endif
 
 #else

shared-module/busdisplay/BusDisplay.c

@@ -214,7 +214,7 @@ static void _send_pixels(busdisplay_busdisplay_obj_t *self, uint8_t *pixels, uin
 }
 
 static bool _refresh_area(busdisplay_busdisplay_obj_t *self, const displayio_area_t *area) {
-    uint32_t buffer_size = CIRCUITPY_DISPLAY_AREA_BUFFER_SIZE; // In uint32_ts
+    uint32_t buffer_size = CIRCUITPY_DISPLAY_AREA_BUFFER_SIZE / sizeof(uint32_t); // In uint32_ts
 
     displayio_area_t clipped;
     // Clip the area to the display by overlapping the areas. If there is no overlap then we're done.
@@ -262,8 +262,6 @@ static bool _refresh_area(busdisplay_busdisplay_obj_t *self, const displayio_are
 
     uint16_t remaining_rows = displayio_area_height(&clipped);
 
-    bool async_bus = (self->bus.flush != NULL);
-
     for (uint16_t j = 0; j < subrectangles; j++) {
         displayio_area_t subrectangle = {
             .x1 = clipped.x1,
@@ -286,31 +284,15 @@ static bool _refresh_area(busdisplay_busdisplay_obj_t *self, const displayio_are
         memset(mask, 0, mask_length * sizeof(mask[0]));
         memset(buffer, 0, buffer_size * sizeof(buffer[0]));
 
-        if (async_bus) {
-            // Async path: fill_area overlaps with previous DMA transfer.
-            // begin_transaction() waits for prior DMA to finish.
-            displayio_display_core_fill_area(&self->core, &subrectangle, mask, buffer);
-
-            if (!displayio_display_bus_begin_transaction(&self->bus)) {
-                return false;
-            }
-            displayio_display_bus_send_region_commands(&self->bus, &self->core, &subrectangle);
-            _send_pixels(self, (uint8_t *)buffer, subrectangle_size_bytes);
-            displayio_display_bus_end_transaction(&self->bus);
-        } else {
-            // Sync path: set region first, then fill and send.
-            displayio_display_bus_set_region_to_update(&self->bus, &self->core, &subrectangle);
-
-            displayio_display_core_fill_area(&self->core, &subrectangle, mask, buffer);
+        displayio_display_core_fill_area(&self->core, &subrectangle, mask, buffer);
 
-            if (!displayio_display_bus_is_free(&self->bus)) {
-                return false;
-            }
+        displayio_display_bus_set_region_to_update(&self->bus, &self->core, &subrectangle);
 
-            displayio_display_bus_begin_transaction(&self->bus);
-            _send_pixels(self, (uint8_t *)buffer, subrectangle_size_bytes);
-            displayio_display_bus_end_transaction(&self->bus);
+        if (!displayio_display_bus_begin_transaction(&self->bus)) {
+            return false;
         }
+        _send_pixels(self, (uint8_t *)buffer, subrectangle_size_bytes);
+        displayio_display_bus_end_transaction(&self->bus);
 
         // Run background tasks so they can run during an explicit refresh.
         // Auto-refresh won't run background tasks here because it is a background task itself.

shared-module/displayio/bus_core.c

@@ -255,10 +255,6 @@ void displayio_display_bus_set_region_to_update(displayio_display_bus_t *self, d
     _displayio_display_bus_send_region_commands(self, display, area, true);
 }
 
-void displayio_display_bus_send_region_commands(displayio_display_bus_t *self, displayio_display_core_t *display, displayio_area_t *area) {
-    _displayio_display_bus_send_region_commands(self, display, area, false);
-}
-
 void displayio_display_bus_flush(displayio_display_bus_t *self) {
     if (self->flush != NULL) {
         self->flush(self->bus);

shared-module/displayio/bus_core.h

@@ -50,10 +50,6 @@ void displayio_display_bus_end_transaction(displayio_display_bus_t *self);
 
 void displayio_display_bus_set_region_to_update(displayio_display_bus_t *self, displayio_display_core_t *display, displayio_area_t *area);
 
-// Send column/row window commands within an already-open transaction.
-// Caller must have called displayio_display_bus_begin_transaction() first.
-void displayio_display_bus_send_region_commands(displayio_display_bus_t *self, displayio_display_core_t *display, displayio_area_t *area);
-
 // Drain any pending asynchronous transfers on the bus.
 // No-op for synchronous buses (FourWire, I2C, ParallelBus).
 void displayio_display_bus_flush(displayio_display_bus_t *self);

shared-module/framebufferio/FramebufferDisplay.c

@@ -117,7 +117,7 @@ static const displayio_area_t *_get_refresh_areas(framebufferio_framebufferdispl
 
 #define MARK_ROW_DIRTY(r) (dirty_row_bitmask[r / 8] |= (1 << (r & 7)))
 static bool _refresh_area(framebufferio_framebufferdisplay_obj_t *self, const displayio_area_t *area, uint8_t *dirty_row_bitmask) {
-    uint16_t buffer_size = CIRCUITPY_DISPLAY_AREA_BUFFER_SIZE; // In uint32_ts
+    uint16_t buffer_size = CIRCUITPY_DISPLAY_AREA_BUFFER_SIZE / sizeof(uint32_t); // In uint32_ts
 
     displayio_area_t clipped;
     // Clip the area to the display by overlapping the areas. If there is no overlap then we're done.