feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'feature/new_esp_psram_component' into 'master'

Browse Source 
esp_psram: new esp psram component

Closes IDF-4318, IDF-4382, IDF-4841, and IDFGH-7192

See merge request espressif/esp-idf!18050
This commit is contained in:
Armando (Dou Yiwen)
2022-06-15 19:16:56 +08:00
parent 62fe93f9ad 26df228b11
commit 0b80546f8e
79 changed files with 1426 additions and 2007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_lcd/src/esp_lcd_rgb_panel.c
View File

@@ -32,7 +32,7 @@
#include "driver/gpio.h"
#include "esp_private/periph_ctrl.h"
#if CONFIG_SPIRAM
#include "spiram.h"
#include "esp_psram.h"
#endif
#include "esp_lcd_common.h"
#include "soc/lcd_periph.h"
@@ -141,7 +141,7 @@ esp_err_t esp_lcd_new_rgb_panel(const esp_lcd_rgb_panel_config_t *rgb_panel_conf
// fb_in_psram is only an option, if there's no PSRAM on board, we still alloc from SRAM
if (rgb_panel_config->flags.fb_in_psram) {
#if CONFIG_SPIRAM_USE_MALLOC || CONFIG_SPIRAM_USE_CAPS_ALLOC
if (esp_spiram_is_initialized()) {
if (esp_psram_is_initialized()) {
alloc_from_psram = true;
}
#endif