Skip to contentSkip to conversation

fbdev: make offb driver tristate

PATCH Applied Randy Dunlap 4 participants 5 messages Nov 26, 2022 – Dec 27, 2022 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fbdev: make offb driver tristate

Make the offb (Open Firmware frame buffer) driver tristate, i.e., so that it can be built as a loadable module.

However, it still depends on the setting of DRM_OFDRM so that both of these drivers cannot be builtin at the same time nor can one be builtin and the other one a loadable module.

Build-tested successfully with all combination of DRM_OFDRM and FB_OF.

This fixes a build issue that Michal reported when FB_OF=y and DRM_OFDRM=m:

powerpc64-linux-ld: drivers/video/fbdev/offb.o:(.data.rel.ro+0x58): undefined reference to `cfb_fillrect'
powerpc64-linux-ld: drivers/video/fbdev/offb.o:(.data.rel.ro+0x60): undefined reference to `cfb_copyarea'
powerpc64-linux-ld: drivers/video/fbdev/offb.o:(.data.rel.ro+0x68): undefined reference to `cfb_imageblit'

---
 drivers/video/fbdev/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/Kconfig +2 -2
diff -- a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
@@ -456,8 +456,8 @@ config FB_ATARI
 	  chipset found in Ataris.
 
 config FB_OF
-	bool "Open Firmware frame buffer device support"
-	depends on (FB = y) && PPC && (!PPC_PSERIES || PCI)
+	tristate "Open Firmware frame buffer device support"
+	depends on FB && PPC && (!PPC_PSERIES || PCI)
 	depends on !DRM_OFDRM
 	select APERTURE_HELPERS
 	select FB_CFB_FILLRECT
Acked-by on v1 1/1
#1 lore raw

Am 26.11.22 um 01:04 schrieb Randy Dunlap:

Quoted 16 lines

Make the offb (Open Firmware frame buffer) driver tristate, i.e., so that it can be built as a loadable module.

However, it still depends on the setting of DRM_OFDRM so that both of these drivers cannot be builtin at the same time nor can one be builtin and the other one a loadable module.

Build-tested successfully with all combination of DRM_OFDRM and FB_OF.

This fixes a build issue that Michal reported when FB_OF=y and DRM_OFDRM=m:

powerpc64-linux-ld: drivers/video/fbdev/offb.o:(.data.rel.ro+0x58): undefined reference to `cfb_fillrect'
powerpc64-linux-ld: drivers/video/fbdev/offb.o:(.data.rel.ro+0x60): undefined reference to `cfb_copyarea'
powerpc64-linux-ld: drivers/video/fbdev/offb.o:(.data.rel.ro+0x68): undefined reference to `cfb_imageblit'

Quoted 10 lines
Quoted 19 lines
---
  drivers/video/fbdev/Kconfig |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff -- a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig

drivers/video/fbdev/Kconfig +2 -2
@@ -456,8 +456,8 @@ config FB_ATARI
  	  chipset found in Ataris.
 
  config FB_OF
-	bool "Open Firmware frame buffer device support"
-	depends on (FB = y) && PPC && (!PPC_PSERIES || PCI)
+	tristate "Open Firmware frame buffer device support"
+	depends on FB && PPC && (!PPC_PSERIES || PCI)
  	depends on !DRM_OFDRM
  	select APERTURE_HELPERS
  	select FB_CFB_FILLRECT
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 Applied
#2 lore raw
Quoted 28 lines · Thomas Zimmermann

Am 26.11.22 um 01:04 schrieb Randy Dunlap:

Quoted 16 lines

Make the offb (Open Firmware frame buffer) driver tristate, i.e., so that it can be built as a loadable module.

However, it still depends on the setting of DRM_OFDRM so that both of these drivers cannot be builtin at the same time nor can one be builtin and the other one a loadable module.

Build-tested successfully with all combination of DRM_OFDRM and FB_OF.

This fixes a build issue that Michal reported when FB_OF=y and DRM_OFDRM=m:

powerpc64-linux-ld: drivers/video/fbdev/offb.o:(.data.rel.ro+0x58): undefined reference to `cfb_fillrect'
powerpc64-linux-ld: drivers/video/fbdev/offb.o:(.data.rel.ro+0x60): undefined reference to `cfb_copyarea'
powerpc64-linux-ld: drivers/video/fbdev/offb.o:(.data.rel.ro+0x68): undefined reference to `cfb_imageblit'

Quoted 10 lines
Quoted 1 line

applied.

Thanks!
Helge

Quoted 19 lines
Quoted 18 lines

---
  drivers/video/fbdev/Kconfig |    4 ++--

  1 file changed, 2 insertions(+), 2 deletions(-)

diff -- a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig

drivers/video/fbdev/Kconfig +0 -0
@@ -456,8 +456,8 @@ config FB_ATARI

        chipset found in Ataris.
  config FB_OF
-    bool "Open Firmware frame buffer device support" -    depends on (FB = y) && PPC && (!PPC_PSERIES || PCI) +    tristate "Open Firmware frame buffer device support" +    depends on FB && PPC && (!PPC_PSERIES || PCI) depends on !DRM_OFDRM
      select APERTURE_HELPERS
      select FB_CFB_FILLRECT

#3 lore raw
Quoted 29 lines · Helge Deller
Quoted 28 lines · Thomas Zimmermann

Am 26.11.22 um 01:04 schrieb Randy Dunlap:

Quoted 26 lines

Make the offb (Open Firmware frame buffer) driver tristate, i.e., so that it can be built as a loadable module.

However, it still depends on the setting of DRM_OFDRM so that both of these drivers cannot be builtin at the same time nor can one be builtin and the other one a loadable module.

Build-tested successfully with all combination of DRM_OFDRM and FB_OF.

This fixes a build issue that Michal reported when FB_OF=y and DRM_OFDRM=m:

powerpc64-linux-ld: drivers/video/fbdev/offb.o:(.data.rel.ro+0x58): undefined reference to `cfb_fillrect'
powerpc64-linux-ld: drivers/video/fbdev/offb.o:(.data.rel.ro+0x60): undefined reference to `cfb_copyarea'
powerpc64-linux-ld: drivers/video/fbdev/offb.o:(.data.rel.ro+0x68): undefined reference to `cfb_imageblit'

Quoted 3 lines
Quoted 1 line

applied.

Is this going to make it to Linus soon? We are now seeing this error in our CI, which has the configuration describe in this commit.

https://github.com/ClangBuiltLinux/continuous-integration2/actions/runs/3785609002/jobs/6437398666#step:5:149

https://storage.tuxsuite.com/public/clangbuiltlinux/continuous-integration2/builds/2JUMSmjAoSJoKfl6PPjfU66JGit/build.log

Cheers,
Nathan

Quoted 20 lines
Quoted 18 lines
Quoted 17 lines

---
  drivers/video/fbdev/Kconfig |    4 ++--

  1 file changed, 2 insertions(+), 2 deletions(-)

diff -- a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig

drivers/video/fbdev/Kconfig +0 -0
@@ -456,8 +456,8 @@ config FB_ATARI

        chipset found in Ataris.
  config FB_OF
-    bool "Open Firmware frame buffer device support" -    depends on (FB = y) && PPC && (!PPC_PSERIES || PCI) +    tristate "Open Firmware frame buffer device support" +    depends on FB && PPC && (!PPC_PSERIES || PCI) depends on !DRM_OFDRM
      select APERTURE_HELPERS
      select FB_CFB_FILLRECT

maintainer
#4 lore raw
Quoted 32 lines · Nathan Chancellor
Quoted 31 lines · Helge Deller
Quoted 29 lines · Thomas Zimmermann

Am 26.11.22 um 01:04 schrieb Randy Dunlap:

Quoted 16 lines

Make the offb (Open Firmware frame buffer) driver tristate, i.e., so that it can be built as a loadable module.

However, it still depends on the setting of DRM_OFDRM so that both of these drivers cannot be builtin at the same time nor can one be builtin and the other one a loadable module.

Build-tested successfully with all combination of DRM_OFDRM and FB_OF.

This fixes a build issue that Michal reported when FB_OF=y and DRM_OFDRM=m:

powerpc64-linux-ld: drivers/video/fbdev/offb.o:(.data.rel.ro+0x58): undefined reference to `cfb_fillrect'
powerpc64-linux-ld: drivers/video/fbdev/offb.o:(.data.rel.ro+0x60): undefined reference to `cfb_copyarea'
powerpc64-linux-ld: drivers/video/fbdev/offb.o:(.data.rel.ro+0x68): undefined reference to `cfb_imageblit'

Quoted 10 lines
Quoted 8 lines
Quoted 1 line

applied.

Is this going to make it to Linus soon? We are now seeing this error in our CI, which has the configuration describe in this commit.

https://github.com/ClangBuiltLinux/continuous-integration2/actions/runs/3785609002/jobs/6437398666#step:5:149

https://storage.tuxsuite.com/public/clangbuiltlinux/continuous-integration2/builds/2JUMSmjAoSJoKfl6PPjfU66JGit/build.log

It didn't applied cleanly earlier.
I've now added it to the fbdev for-next branch, and if no problems show up in the next few days I'll push it before next weekend.
https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git/log/?h=for-next

Helge

Quoted 23 lines

Cheers,
Nathan

Quoted 20 lines
Quoted 18 lines
Quoted 17 lines
---
   drivers/video/fbdev/Kconfig |    4 ++--
   1 file changed, 2 insertions(+), 2 deletions(-)

diff -- a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig

drivers/video/fbdev/Kconfig +2 -2
@@ -456,8 +456,8 @@ config FB_ATARI
         chipset found in Ataris.
   config FB_OF
-    bool "Open Firmware frame buffer device support"
-    depends on (FB = y) && PPC && (!PPC_PSERIES || PCI)
+    tristate "Open Firmware frame buffer device support"
+    depends on FB && PPC && (!PPC_PSERIES || PCI)
       depends on !DRM_OFDRM
       select APERTURE_HELPERS
       select FB_CFB_FILLRECT