From d44dc57f8aa0eb6eac5f9e7fcfd9adcdacef4dbb Mon Sep 17 00:00:00 2001 From: Brian Whitman Date: Sat, 20 Jan 2024 10:59:24 -0800 Subject: [PATCH] fix(rgb_lcd): don't assume 16 bit width on panels for restart logic Merges https://github.com/espressif/esp-idf/pull/13020 --- components/esp_lcd/src/esp_lcd_panel_rgb.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/components/esp_lcd/src/esp_lcd_panel_rgb.c b/components/esp_lcd/src/esp_lcd_panel_rgb.c index dc1c2e1a3f8b..716cd5539d45 100644 --- a/components/esp_lcd/src/esp_lcd_panel_rgb.c +++ b/components/esp_lcd/src/esp_lcd_panel_rgb.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -99,11 +99,11 @@ struct esp_rgb_panel_t { uint8_t *fbs[RGB_LCD_PANEL_MAX_FB_NUM]; // Frame buffers uint8_t cur_fb_index; // Current frame buffer index uint8_t bb_fb_index; // Current frame buffer index which used by bounce buffer - size_t fb_size; // Size of frame buffer + size_t fb_size; // Size of frame buffer, in bytes int data_gpio_nums[SOC_LCD_RGB_DATA_WIDTH]; // GPIOs used for data lines, we keep these GPIOs for action like "invert_color" uint32_t src_clk_hz; // Peripheral source clock resolution esp_lcd_rgb_timing_t timings; // RGB timing parameters (e.g. pclk, sync pulse, porch width) - size_t bb_size; // If not-zero, the driver uses two bounce buffers allocated from internal memory + size_t bb_size; // Size of the bounce buffer, in bytes. If not-zero, the driver uses two bounce buffers allocated from internal memory int bounce_pos_px; // Position in whatever source material is used for the bounce buffer, in pixels uint8_t *bounce_buffer[RGB_LCD_PANEL_BOUNCE_BUF_NUM]; // Pointer to the bounce buffers gdma_channel_handle_t dma_chan; // DMA channel handle @@ -308,6 +308,7 @@ esp_err_t esp_lcd_new_rgb_panel(const esp_lcd_rgb_panel_config_t *rgb_panel_conf // install DMA service rgb_panel->flags.stream_mode = !rgb_panel_config->flags.refresh_on_demand; + rgb_panel->fb_bits_per_pixel = fb_bits_per_pixel; ret = lcd_rgb_panel_create_trans_link(rgb_panel); ESP_GOTO_ON_ERROR(ret, err, TAG, "install DMA failed"); // configure GPIO @@ -317,7 +318,6 @@ esp_err_t esp_lcd_new_rgb_panel(const esp_lcd_rgb_panel_config_t *rgb_panel_conf memcpy(rgb_panel->data_gpio_nums, rgb_panel_config->data_gpio_nums, SOC_LCD_RGB_DATA_WIDTH); rgb_panel->timings = rgb_panel_config->timings; rgb_panel->data_width = rgb_panel_config->data_width; - rgb_panel->fb_bits_per_pixel = fb_bits_per_pixel; rgb_panel->output_bits_per_pixel = fb_bits_per_pixel; // by default, the output bpp is the same as the frame buffer bpp rgb_panel->disp_gpio_num = rgb_panel_config->disp_gpio_num; rgb_panel->flags.disp_en_level = !rgb_panel_config->flags.disp_active_low; @@ -985,7 +985,7 @@ static esp_err_t lcd_rgb_panel_create_trans_link(esp_rgb_panel_t *panel) // so we use a dedicated DMA node to restart the DMA transaction // see also `lcd_rgb_panel_try_restart_transmission` memcpy(&panel->dma_restart_node, &panel->dma_nodes[0], sizeof(panel->dma_restart_node)); - int restart_skip_bytes = LCD_FIFO_PRESERVE_SIZE_PX * sizeof(uint16_t); + int restart_skip_bytes = LCD_FIFO_PRESERVE_SIZE_PX * (panel->fb_bits_per_pixel / 8); uint8_t *p = (uint8_t *)panel->dma_restart_node.buffer; panel->dma_restart_node.buffer = &p[restart_skip_bytes]; panel->dma_restart_node.dw0.length -= restart_skip_bytes; @@ -1023,6 +1023,7 @@ static esp_err_t lcd_rgb_panel_create_trans_link(esp_rgb_panel_t *panel) // time to reset DMA. static IRAM_ATTR void lcd_rgb_panel_try_restart_transmission(esp_rgb_panel_t *panel) { + int bb_size_px = panel->bb_size / (panel->fb_bits_per_pixel / 8); bool do_restart = false; #if CONFIG_LCD_RGB_RESTART_IN_VSYNC do_restart = true; @@ -1041,11 +1042,11 @@ static IRAM_ATTR void lcd_rgb_panel_try_restart_transmission(esp_rgb_panel_t *pa if (panel->bb_size) { // Catch de-synced frame buffer and reset if needed. - if (panel->bounce_pos_px > panel->bb_size) { + if (panel->bounce_pos_px > bb_size_px * 2) { panel->bounce_pos_px = 0; } // Pre-fill bounce buffer 0, if the EOF ISR didn't do that already - if (panel->bounce_pos_px < panel->bb_size / 2) { + if (panel->bounce_pos_px < bb_size_px) { lcd_rgb_panel_fill_bounce_buffer(panel, panel->bounce_buffer[0]); } } @@ -1056,10 +1057,11 @@ static IRAM_ATTR void lcd_rgb_panel_try_restart_transmission(esp_rgb_panel_t *pa if (panel->bb_size) { // Fill 2nd bounce buffer while 1st is being sent out, if needed. - if (panel->bounce_pos_px < panel->bb_size) { - lcd_rgb_panel_fill_bounce_buffer(panel, panel->bounce_buffer[0]); + if (panel->bounce_pos_px < bb_size_px * 2) { + lcd_rgb_panel_fill_bounce_buffer(panel, panel->bounce_buffer[1]); } } + } static void lcd_rgb_panel_start_transmission(esp_rgb_panel_t *rgb_panel)