joric
diff --git a/‎shared-module/displayio/Display.c
Lines changed: 2 additions & 3 deletions b/‎shared-module/displayio/Display.c
Lines changed: 2 additions & 3 deletions
diff --git a/‎shared-module/displayio/__init__.c
Lines changed: 0 additions & 10 deletions b/‎shared-module/displayio/__init__.c
Lines changed: 0 additions & 10 deletions
diff --git a/‎shared-module/displayio/display_core.c
Lines changed: 11 additions & 1 deletion b/‎shared-module/displayio/display_core.c
Lines changed: 11 additions & 1 deletion
diff --git a/‎shared-module/displayio/display_core.h
Lines changed: 2 additions & 1 deletion b/‎shared-module/displayio/display_core.h
Lines changed: 2 additions & 1 deletion
@@ -328,11 +328,10 @@ STATIC bool _refresh_area(displayio_display_obj_t* self, const displayio_area_t*
 }
 
 STATIC void _refresh_display(displayio_display_obj_t* self) {
-    if (!displayio_display_core_bus_free(&self->core)) {
-        // Can't acquire display bus; skip updating this display. Try next display.
+    if (!displayio_display_core_start_refresh(&self->core)) {
+        // A refresh on this bus is already in progress.  Try next display.
         return;
     }
-    displayio_display_core_start_refresh(&self->core);
     const displayio_area_t* current_area = _get_refresh_areas(self);
     while (current_area != NULL) {
         _refresh_area(self, current_area);
 
@@ -40,8 +40,6 @@ STATIC bool any_display_uses_this_framebuffer(mp_obj_base_t *obj) {
 }
 #endif
 
-// Check for recursive calls to displayio_background.
-bool displayio_background_in_progress = false;
 
 void displayio_background(void) {
     if (mp_hal_is_interrupted()) {
@@ -52,12 +50,6 @@ void displayio_background(void) {
         return;
     }
 
-    if (displayio_background_in_progress) {
-        // Don't allow recursive calls to this routine.
-        return;
-    }
-
-    displayio_background_in_progress = true;
 
     for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
         if (displays[i].display.base.type == NULL || displays[i].display.base.type == &mp_type_NoneType) {
@@ -75,8 +67,6 @@ void displayio_background(void) {
         }
     }
 
-    // All done.
-    displayio_background_in_progress = false;
 }
 
 void common_hal_displayio_release_displays(void) {
 
@@ -316,8 +316,17 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t* self,
     }
 }
 
-void displayio_display_core_start_refresh(displayio_display_core_t* self) {
+bool displayio_display_core_start_refresh(displayio_display_core_t* self) {
+    if (!displayio_display_core_bus_free(self)) {
+        // Can't acquire display bus; skip updating this display. Try next display.
+        return false;
+    }
+    if (self->refresh_in_progress) {
+        return false;
+    }
+    self->refresh_in_progress = true;
     self->last_refresh = supervisor_ticks_ms64();
+    return true;
 }
 
 void displayio_display_core_finish_refresh(displayio_display_core_t* self) {
@@ -326,6 +335,7 @@ void displayio_display_core_finish_refresh(displayio_display_core_t* self) {
         displayio_group_finish_refresh(self->current_group);
     }
     self->full_refresh = false;
+    self->refresh_in_progress = false;
     self->last_refresh = supervisor_ticks_ms64();
 }
 
 
@@ -54,6 +54,7 @@ typedef struct {
     int16_t colstart;
     int16_t rowstart;
     bool full_refresh; // New group means we need to refresh the whole display.
+    bool refresh_in_progress;
 } displayio_display_core_t;
 
 void displayio_display_core_construct(displayio_display_core_t* self,
@@ -81,7 +82,7 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t* self,
 
 void release_display_core(displayio_display_core_t* self);
 
-void displayio_display_core_start_refresh(displayio_display_core_t* self);
+bool displayio_display_core_start_refresh(displayio_display_core_t* self);
 void displayio_display_core_finish_refresh(displayio_display_core_t* self);
 
 void displayio_display_core_collect_ptrs(displayio_display_core_t* self);
Original file line number	Diff line number	Diff line change
`@@ -328,11 +328,10 @@ STATIC bool _refresh_area(displayio_display_obj_t* self, const displayio_area_t*`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`STATIC void _refresh_display(displayio_display_obj_t* self) {`
`331`		`- if (!displayio_display_core_bus_free(&self->core)) {`
`332`		`- // Can't acquire display bus; skip updating this display. Try next display.`
	`331`	`+ if (!displayio_display_core_start_refresh(&self->core)) {`
	`332`	`+ // A refresh on this bus is already in progress. Try next display.`
`333`	`333`	`return;`
`334`	`334`	`}`
`335`		`- displayio_display_core_start_refresh(&self->core);`
`336`	`335`	`const displayio_area_t* current_area = _get_refresh_areas(self);`
`337`	`336`	`while (current_area != NULL) {`
`338`	`337`	`_refresh_area(self, current_area);`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@ STATIC bool any_display_uses_this_framebuffer(mp_obj_base_t *obj) {`
`40`	`40`	`}`
`41`	`41`	`#endif`
`42`	`42`
`43`		`-// Check for recursive calls to displayio_background.`
`44`		`-bool displayio_background_in_progress = false;`
`45`	`43`
`46`	`44`	`void displayio_background(void) {`
`47`	`45`	`if (mp_hal_is_interrupted()) {`
`@@ -52,12 +50,6 @@ void displayio_background(void) {`
`52`	`50`	`return;`
`53`	`51`	`}`
`54`	`52`
`55`		`- if (displayio_background_in_progress) {`
`56`		`- // Don't allow recursive calls to this routine.`
`57`		`- return;`
`58`		`- }`
`59`		`-`
`60`		`- displayio_background_in_progress = true;`
`61`	`53`
`62`	`54`	`for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {`
`63`	`55`	`if (displays[i].display.base.type == NULL \|\| displays[i].display.base.type == &mp_type_NoneType) {`
`@@ -75,8 +67,6 @@ void displayio_background(void) {`
`75`	`67`	`}`
`76`	`68`	`}`
`77`	`69`
`78`		`- // All done.`
`79`		`- displayio_background_in_progress = false;`
`80`	`70`	`}`
`81`	`71`
`82`	`72`	`void common_hal_displayio_release_displays(void) {`
Original file line number	Diff line number	Diff line change
`@@ -316,8 +316,17 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t* self,`
`316`	`316`	`}`
`317`	`317`	`}`
`318`	`318`
`319`		`-void displayio_display_core_start_refresh(displayio_display_core_t* self) {`
	`319`	`+bool displayio_display_core_start_refresh(displayio_display_core_t* self) {`
	`320`	`+ if (!displayio_display_core_bus_free(self)) {`
	`321`	`+ // Can't acquire display bus; skip updating this display. Try next display.`
	`322`	`+ return false;`
	`323`	`+ }`
	`324`	`+ if (self->refresh_in_progress) {`
	`325`	`+ return false;`
	`326`	`+ }`
	`327`	`+ self->refresh_in_progress = true;`
`320`	`328`	`self->last_refresh = supervisor_ticks_ms64();`
	`329`	`+ return true;`
`321`	`330`	`}`
`322`	`331`
`323`	`332`	`void displayio_display_core_finish_refresh(displayio_display_core_t* self) {`
`@@ -326,6 +335,7 @@ void displayio_display_core_finish_refresh(displayio_display_core_t* self) {`
`326`	`335`	`displayio_group_finish_refresh(self->current_group);`
`327`	`336`	`}`
`328`	`337`	`self->full_refresh = false;`
	`338`	`+ self->refresh_in_progress = false;`
`329`	`339`	`self->last_refresh = supervisor_ticks_ms64();`
`330`	`340`	`}`
`331`	`341`