Merge pull request adafruit#8698 from jepler/qualia-width-16

jepler · web-flow · commit 45e721a7cc72 · 2023-12-06T11:25:35.000-06:00
rgbframebuffer: round up internal size to multiple of 16 pixels
diff --git a/ports/espressif/common-hal/dotclockframebuffer/DotClockFramebuffer.c b/ports/espressif/common-hal/dotclockframebuffer/DotClockFramebuffer.c
@@ -114,7 +114,7 @@ void common_hal_dotclockframebuffer_framebuffer_construct(dotclockframebuffer_fr
 
     esp_lcd_rgb_panel_config_t *cfg = &self->panel_config;
     cfg->timings.pclk_hz = frequency;
-    cfg->timings.h_res = width + overscan_left;
+    cfg->timings.h_res = (width + overscan_left + 15) / 16 * 16; // round up to multiple of 16
     cfg->timings.v_res = height;
     cfg->timings.hsync_pulse_width = hsync_pulse_width;
     cfg->timings.hsync_back_porch = hsync_back_porch;
@@ -174,9 +174,10 @@ void common_hal_dotclockframebuffer_framebuffer_construct(dotclockframebuffer_fr
     cp_check_esp_error(esp_lcd_rgb_panel_get_frame_buffer(self->panel_handle, 1, &fb));
 
     self->frequency = frequency;
-    self->row_stride = 2 * (width + overscan_left);
+    self->width = width;
+    self->row_stride = 2 * (cfg->timings.h_res);
     self->first_pixel_offset = 2 * overscan_left;
-    self->refresh_rate = frequency / (width + hsync_front_porch + hsync_back_porch) / (height + vsync_front_porch + vsync_back_porch);
+    self->refresh_rate = frequency / (cfg->timings.h_res + hsync_front_porch + hsync_back_porch) / (height + vsync_front_porch + vsync_back_porch);
     self->bufinfo.buf = (uint8_t *)fb;
     self->bufinfo.len = 2 * (cfg->timings.h_res * cfg->timings.v_res);
     self->bufinfo.typecode = 'H' | MP_OBJ_ARRAY_TYPECODE_FLAG_RW;
@@ -203,7 +204,7 @@ bool common_hal_dotclockframebuffer_framebuffer_deinitialized(dotclockframebuffe
 
 
 mp_int_t common_hal_dotclockframebuffer_framebuffer_get_width(dotclockframebuffer_framebuffer_obj_t *self) {
-    return self->panel_config.timings.h_res - self->first_pixel_offset / 2;
+    return self->width;
 }
 
 mp_int_t common_hal_dotclockframebuffer_framebuffer_get_height(dotclockframebuffer_framebuffer_obj_t *self) {
diff --git a/ports/espressif/common-hal/dotclockframebuffer/DotClockFramebuffer.h b/ports/espressif/common-hal/dotclockframebuffer/DotClockFramebuffer.h
@@ -37,7 +37,7 @@
 typedef struct dotclockframebuffer_framebuffer_obj {
     mp_obj_base_t base;
     mp_buffer_info_t bufinfo;
-    mp_int_t row_stride;
+    mp_int_t width, row_stride;
     uint32_t frequency, refresh_rate;
     uint32_t first_pixel_offset;
     uint64_t used_pins_mask;
