From 06ba67e49fb367f2b960def49b90ad93459ba10a Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Thu, 8 Aug 2024 15:55:05 -0500 Subject: [PATCH] Revert "fbdev: Make registered_fb[] private to fbmem.c" This reverts commit 5727dcfd8486399c40e39d2c08fe36fedab29d99. Change-Id: I724a29c438f62d504a386795e59685e5b6c1c3a1 --- drivers/video/fbdev/core/fbmem.c | 6 +++--- include/linux/fb.h | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 3c568cff2913..8d4966a9a32a 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -30,10 +30,10 @@ struct class *fb_class; DEFINE_MUTEX(registration_lock); struct fb_info *registered_fb[FB_MAX] __read_mostly; +EXPORT_SYMBOL(registered_fb); + int num_registered_fb __read_mostly; -#define for_each_registered_fb(i) \ - for (i = 0; i < FB_MAX; i++) \ - if (!registered_fb[i]) {} else +EXPORT_SYMBOL(num_registered_fb); struct fb_info *get_fb_info(unsigned int idx) { diff --git a/include/linux/fb.h b/include/linux/fb.h index 267b59ead432..cea7408a7c38 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -613,6 +613,13 @@ extern int fb_get_color_depth(struct fb_var_screeninfo *var, extern int fb_get_options(const char *name, char **option); extern int fb_new_modelist(struct fb_info *info); +extern struct fb_info *registered_fb[FB_MAX]; +extern int num_registered_fb; + +#define for_each_registered_fb(i) \ + for (i = 0; i < FB_MAX; i++) \ + if (!registered_fb[i]) {} else + static inline void lock_fb_info(struct fb_info *info) { mutex_lock(&info->lock);