From 2877ed4b964fa85a131dc50e25f0f630064d2a15 Mon Sep 17 00:00:00 2001
From: Tomas Rezucha <tomas.rezucha@espressif.com>
Date: Thu, 9 Jan 2025 16:35:50 +0100
Subject: [PATCH] fix(esp_lvgl_port): Init LVGL in lvgl_port_init() call

Previously, we initialized LVGL in the new LVGL handling task.
If lvgl_port_init() was called from high priority task, it could
return with uninitialized LVGL.

Closes https://github.com/espressif/esp-bsp/issues/455
---
 components/esp_lvgl_port/CHANGELOG.md              |  5 +++++
 components/esp_lvgl_port/src/lvgl9/esp_lvgl_port.c | 14 +++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/components/esp_lvgl_port/CHANGELOG.md b/components/esp_lvgl_port/CHANGELOG.md
index 47e9fcf0..7ef30355 100644
--- a/components/esp_lvgl_port/CHANGELOG.md
+++ b/components/esp_lvgl_port/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [Unreleased]
+
+### Fixes
+- Fixed a crash when esp_lvgl_port was initialized from high priority task https://github.com/espressif/esp-bsp/issues/455
+
 ## 2.4.3
 
 ### Fixes
diff --git a/components/esp_lvgl_port/src/lvgl9/esp_lvgl_port.c b/components/esp_lvgl_port/src/lvgl9/esp_lvgl_port.c
index 314343cf..1aeb872c 100644
--- a/components/esp_lvgl_port/src/lvgl9/esp_lvgl_port.c
+++ b/components/esp_lvgl_port/src/lvgl9/esp_lvgl_port.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -84,12 +84,17 @@ esp_err_t lvgl_port_init(const lvgl_port_cfg_t *cfg)
 
     BaseType_t res;
     if (cfg->task_affinity < 0) {
-        res = xTaskCreate(lvgl_port_task, "taskLVGL", cfg->task_stack, NULL, cfg->task_priority, &lvgl_port_ctx.lvgl_task);
+        res = xTaskCreate(lvgl_port_task, "taskLVGL", cfg->task_stack, xTaskGetCurrentTaskHandle(), cfg->task_priority, &lvgl_port_ctx.lvgl_task);
     } else {
-        res = xTaskCreatePinnedToCore(lvgl_port_task, "taskLVGL", cfg->task_stack, NULL, cfg->task_priority, &lvgl_port_ctx.lvgl_task, cfg->task_affinity);
+        res = xTaskCreatePinnedToCore(lvgl_port_task, "taskLVGL", cfg->task_stack, xTaskGetCurrentTaskHandle(), cfg->task_priority, &lvgl_port_ctx.lvgl_task, cfg->task_affinity);
     }
     ESP_GOTO_ON_FALSE(res == pdPASS, ESP_FAIL, err, TAG, "Create LVGL task fail!");
 
+    // Wait until taskLVGL starts
+    if (ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(5000)) == 0) {
+        ret = ESP_ERR_TIMEOUT;
+    }
+
 err:
     if (ret != ESP_OK) {
         lvgl_port_deinit();
@@ -206,6 +211,7 @@ IRAM_ATTR bool lvgl_port_task_notify(uint32_t value)
 
 static void lvgl_port_task(void *arg)
 {
+    TaskHandle_t task_to_notify = (TaskHandle_t)arg;
     lvgl_port_event_t event;
     uint32_t task_delay_ms = 0;
     lv_indev_t *indev = NULL;
@@ -219,6 +225,8 @@ static void lvgl_port_task(void *arg)
 
     /* LVGL init */
     lv_init();
+    /* LVGL is initialized, notify lvgl_port_init() function about it */
+    xTaskNotifyGive(task_to_notify);
     /* Tick init */
     lvgl_port_tick_init();