From 7a13d56c5920f60499438d9ffbe55c2b8ae151de Mon Sep 17 00:00:00 2001
From: Gabor Kiss-Vamosi <kisvegabor@gmail.com>
Date: Mon, 27 May 2024 06:46:48 +0200
Subject: [PATCH] fix(benchmark): use the correct subject for performance data
 (#6237)

---
 demos/benchmark/lv_demo_benchmark.c |  5 ++---
 demos/music/lv_demo_music.c         | 11 +++++------
 src/core/lv_global.h                |  4 ----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/demos/benchmark/lv_demo_benchmark.c b/demos/benchmark/lv_demo_benchmark.c
index 024ffb67f..cd5b4bb12 100644
--- a/demos/benchmark/lv_demo_benchmark.c
+++ b/demos/benchmark/lv_demo_benchmark.c
@@ -418,8 +418,6 @@ static scene_dsc_t scenes[] = {
     {.name = "", .create_cb = NULL}
 };
 
-#define sysmon_perf LV_GLOBAL_DEFAULT()->sysmon_perf
-
 static uint32_t scene_act;
 static uint32_t rnd_act;
 
@@ -455,7 +453,8 @@ void lv_demo_benchmark(void)
     lv_timer_create(next_scene_timer_cb, scenes[0].scene_time, NULL);
 
 #if LV_USE_PERF_MONITOR
-    lv_subject_add_observer_obj(&sysmon_perf.subject, sysmon_perf_observer_cb, title, NULL);
+    lv_display_t * disp = lv_display_get_default();
+    lv_subject_add_observer_obj(&disp->perf_sysmon_backend.subject, sysmon_perf_observer_cb, title, NULL);
 #else
     lv_label_set_text(title, "LV_USE_PERF_MONITOR is not enabled");
 #endif
diff --git a/demos/music/lv_demo_music.c b/demos/music/lv_demo_music.c
index ab5ba6211..2c1a38621 100644
--- a/demos/music/lv_demo_music.c
+++ b/demos/music/lv_demo_music.c
@@ -12,7 +12,9 @@
 
 #include "lv_demo_music_main.h"
 #include "lv_demo_music_list.h"
-#include "../../src/core/lv_global.h"
+#if LV_DEMO_MUSIC_AUTO_PLAY && LV_USE_PERF_MONITOR
+    #include "../../src/display/lv_display_private.h"
+#endif
 
 /*********************
  *      DEFINES
@@ -104,10 +106,6 @@ static const uint32_t time_list[] = {
     2 * 60 + 19,
 };
 
-#if LV_USE_PERF_MONITOR || LV_DEMO_MUSIC_AUTO_PLAY
-    #define sysmon_perf LV_GLOBAL_DEFAULT()->sysmon_perf
-#endif
-
 /**********************
  *      MACROS
  **********************/
@@ -230,7 +228,8 @@ static void auto_step_cb(lv_timer_t * t)
                 lv_obj_t * num = lv_label_create(bg);
                 lv_obj_set_style_text_font(num, font_large, 0);
 #if LV_USE_PERF_MONITOR
-                const lv_sysmon_perf_info_t * info = lv_subject_get_pointer(&sysmon_perf.subject);
+                lv_display_t * disp = lv_display_get_default();
+                const lv_sysmon_perf_info_t * info = lv_subject_get_pointer(&disp->perf_sysmon_backend.subject);
                 lv_label_set_text_fmt(num, "%" LV_PRIu32, info->calculated.fps_avg_total);
 #endif
                 lv_obj_align(num, LV_ALIGN_TOP_MID, 0, 120);
diff --git a/src/core/lv_global.h b/src/core/lv_global.h
index 050fc8c82..02df3eec7 100644
--- a/src/core/lv_global.h
+++ b/src/core/lv_global.h
@@ -193,10 +193,6 @@ typedef struct _lv_global_t {
     lv_style_t fe_list_button_style;
 #endif
 
-#if LV_USE_PERF_MONITOR
-    lv_sysmon_backend_data_t sysmon_perf;
-#endif
-
 #if LV_USE_MEM_MONITOR
     lv_sysmon_backend_data_t sysmon_mem;
 #endif