Skip to contentSkip to conversation

fbdev: Make registered_fb[] private to fbmem.c

PATCH Applied Javier Martinez Canillas 3 participants 6 messages Jul 25, 2022 – Jul 27, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fbdev: Make registered_fb[] private to fbmem.c

From: Daniel Vetter <[email protected]>

No driver access this anymore, except for the olpc dcon fbdev driver but that has been marked as broken anyways by commit de0952f267ff ("staging:
olpc_dcon: mark driver as broken").

---

 drivers/video/fbdev/core/fbmem.c | 6 +++---
 include/linux/fb.h               | 6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)
drivers/video/fbdev/core/fbmem.c +3 -3
index 6ae1c5fa19f9..1e70d8c67653 100644
@@ -51,10 +51,10 @@
 static DEFINE_MUTEX(registration_lock);
 
 struct fb_info *registered_fb[FB_MAX] __read_mostly;
-EXPORT_SYMBOL(registered_fb);
-
 int num_registered_fb __read_mostly;
-EXPORT_SYMBOL(num_registered_fb);
+#define for_each_registered_fb(i)		\
+	for (i = 0; i < FB_MAX; i++)		\
+		if (!registered_fb[i]) {} else
 
 bool fb_center_logo __read_mostly;
 
include/linux/fb.h +0 -6
index 453c3b2b6b8e..0aff76bcbb00 100644
@@ -627,16 +627,10 @@ 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;
 extern bool fb_center_logo;
 extern int fb_logo_count;
 extern struct class *fb_class;
 
-#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);
Signature · 1 line
2.37.1
Acked-by on v1 1/1
#1 lore raw

Hi

Am 25.07.22 um 09:54 schrieb Javier Martinez Canillas:

Quoted 10 lines

From: Daniel Vetter <[email protected]>

No driver access this anymore, except for the olpc dcon fbdev driver but that has been marked as broken anyways by commit de0952f267ff ("staging:
olpc_dcon: mark driver as broken").

Best regards
Thomas

Quoted 45 lines

---

  drivers/video/fbdev/core/fbmem.c | 6 +++---
  include/linux/fb.h               | 6 ------
  2 files changed, 3 insertions(+), 9 deletions(-)
drivers/video/fbdev/core/fbmem.c +3 -3
index 6ae1c5fa19f9..1e70d8c67653 100644
@@ -51,10 +51,10 @@
  static DEFINE_MUTEX(registration_lock);
 
  struct fb_info *registered_fb[FB_MAX] __read_mostly;
-EXPORT_SYMBOL(registered_fb);
-
  int num_registered_fb __read_mostly;
-EXPORT_SYMBOL(num_registered_fb);
+#define for_each_registered_fb(i)		\
+	for (i = 0; i < FB_MAX; i++)		\
+		if (!registered_fb[i]) {} else
 
  bool fb_center_logo __read_mostly;
 
include/linux/fb.h +0 -6
index 453c3b2b6b8e..0aff76bcbb00 100644
@@ -627,16 +627,10 @@ 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;
  extern bool fb_center_logo;
  extern int fb_logo_count;
  extern struct class *fb_class;
 
-#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);
Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
maintainer Acked-by
#2 lore raw
Quoted 9 lines · Thomas Zimmermann

Hi

Am 25.07.22 um 09:54 schrieb Javier Martinez Canillas:

Quoted 6 lines

From: Daniel Vetter <[email protected]>

No driver access this anymore, except for the olpc dcon fbdev driver but that has been marked as broken anyways by commit de0952f267ff ("staging:
olpc_dcon: mark driver as broken").

Quoted 6 lines
Quoted 4 lines

Helge

Quoted 45 lines

Best regards
Thomas

Quoted 40 lines

---

  drivers/video/fbdev/core/fbmem.c | 6 +++---
  include/linux/fb.h               | 6 ------

  2 files changed, 3 insertions(+), 9 deletions(-)
drivers/video/fbdev/core/fbmem.c +3 -3
index 6ae1c5fa19f9..1e70d8c67653 100644
@@ -51,10 +51,10 @@
   static DEFINE_MUTEX(registration_lock);
     struct fb_info *registered_fb[FB_MAX] __read_mostly;
-EXPORT_SYMBOL(registered_fb);
-
   int num_registered_fb __read_mostly;
-EXPORT_SYMBOL(num_registered_fb);
+#define for_each_registered_fb(i)        \
+    for (i = 0; i < FB_MAX; i++)        \
+        if (!registered_fb[i]) {} else
     bool fb_center_logo __read_mostly;

  diff --git a/include/linux/fb.h b/include/linux/fb.h index 453c3b2b6b8e..0aff76bcbb00 100644

include/linux/fb.h +0 -4
@@ -627,16 +627,10 @@ 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;
   extern bool fb_center_logo;
   extern int fb_logo_count;
   extern struct class *fb_class;
   -#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);
maintainer Applied
#3 lore raw
In reply to Javier Martinez Canillas
Quoted 10 lines · Javier Martinez Canillas

From: Daniel Vetter <[email protected]>

No driver access this anymore, except for the olpc dcon fbdev driver but that has been marked as broken anyways by commit de0952f267ff ("staging:
olpc_dcon: mark driver as broken").

I've applied it to the fbdev git tree.

Thanks!
Helge

Quoted 45 lines

---

 drivers/video/fbdev/core/fbmem.c | 6 +++---
 include/linux/fb.h               | 6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)
drivers/video/fbdev/core/fbmem.c +3 -3
index 6ae1c5fa19f9..1e70d8c67653 100644
@@ -51,10 +51,10 @@
 static DEFINE_MUTEX(registration_lock);
 
 struct fb_info *registered_fb[FB_MAX] __read_mostly;
-EXPORT_SYMBOL(registered_fb);
-
 int num_registered_fb __read_mostly;
-EXPORT_SYMBOL(num_registered_fb);
+#define for_each_registered_fb(i)		\
+	for (i = 0; i < FB_MAX; i++)		\
+		if (!registered_fb[i]) {} else
 
 bool fb_center_logo __read_mostly;
 
include/linux/fb.h +0 -6
index 453c3b2b6b8e..0aff76bcbb00 100644
@@ -627,16 +627,10 @@ 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;
 extern bool fb_center_logo;
 extern int fb_logo_count;
 extern struct class *fb_class;
 
-#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);
maintainer
#4 lore raw
Quoted 7 lines · Helge Deller
Quoted 6 lines · Javier Martinez Canillas

From: Daniel Vetter <[email protected]>

No driver access this anymore, except for the olpc dcon fbdev driver but that has been marked as broken anyways by commit de0952f267ff ("staging:
olpc_dcon: mark driver as broken").

Quoted 6 lines
Quoted 4 lines

I've applied it to the fbdev git tree.

I've dropped that patch for now from the fbdev git tree, since it gave build errors [1] in for-next:

drivers/video/fbdev/simplefb.c:426:6: error: use of undeclared identifier 'num_registered_fb'; did you mean 'WB_registered'?

           if (num_registered_fb > 0) {
               ^~~~~~~~~~~~~~~~~

Helge

[1] https://lore.kernel.org/all/[email protected]/

Quoted 45 lines
Quoted 44 lines
 drivers/video/fbdev/core/fbmem.c | 6 +++---
 include/linux/fb.h               | 6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)
drivers/video/fbdev/core/fbmem.c +3 -3
index 6ae1c5fa19f9..1e70d8c67653 100644
@@ -51,10 +51,10 @@
 static DEFINE_MUTEX(registration_lock);
 
 struct fb_info *registered_fb[FB_MAX] __read_mostly;
-EXPORT_SYMBOL(registered_fb);
-
 int num_registered_fb __read_mostly;
-EXPORT_SYMBOL(num_registered_fb);
+#define for_each_registered_fb(i)		\
+	for (i = 0; i < FB_MAX; i++)		\
+		if (!registered_fb[i]) {} else
 
 bool fb_center_logo __read_mostly;
 
include/linux/fb.h +0 -6
index 453c3b2b6b8e..0aff76bcbb00 100644
@@ -627,16 +627,10 @@ 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;
 extern bool fb_center_logo;
 extern int fb_logo_count;
 extern struct class *fb_class;
 
-#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);
#5 lore raw

Hi

Am 27.07.22 um 06:08 schrieb Helge Deller:

Quoted 13 lines · Helge Deller
Quoted 12 lines · Javier Martinez Canillas
Quoted 10 lines

From: Daniel Vetter <[email protected]>

No driver access this anymore, except for the olpc dcon fbdev driver but that has been marked as broken anyways by commit de0952f267ff ("staging:
olpc_dcon: mark driver as broken").

Quoted 8 lines
Quoted 1 line

I've applied it to the fbdev git tree.

I've dropped that patch for now from the fbdev git tree, since it gave build errors [1] in for-next:

drivers/video/fbdev/simplefb.c:426:6: error: use of undeclared identifier 'num_registered_fb'; did you mean 'WB_registered'?

            if (num_registered_fb > 0) {
                ^~~~~~~~~~~~~~~~~

I've added the patch to drm-misc-next. The issue has been fixed there.

Best regards
Thomas

Quoted 52 lines

Helge

[1] https://lore.kernel.org/all/[email protected]/

Quoted 45 lines
Quoted 44 lines
  drivers/video/fbdev/core/fbmem.c | 6 +++---
  include/linux/fb.h               | 6 ------
  2 files changed, 3 insertions(+), 9 deletions(-)
drivers/video/fbdev/core/fbmem.c +3 -3
index 6ae1c5fa19f9..1e70d8c67653 100644
@@ -51,10 +51,10 @@
  static DEFINE_MUTEX(registration_lock);
 
  struct fb_info *registered_fb[FB_MAX] __read_mostly;
-EXPORT_SYMBOL(registered_fb);
-
  int num_registered_fb __read_mostly;
-EXPORT_SYMBOL(num_registered_fb);
+#define for_each_registered_fb(i)		\
+	for (i = 0; i < FB_MAX; i++)		\
+		if (!registered_fb[i]) {} else
 
  bool fb_center_logo __read_mostly;
 
include/linux/fb.h +0 -6
index 453c3b2b6b8e..0aff76bcbb00 100644
@@ -627,16 +627,10 @@ 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;
  extern bool fb_center_logo;
  extern int fb_logo_count;
  extern struct class *fb_class;
 
-#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);
Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev