mbox series

[v3,0/3] arch: Remove fbdev dependency from video helpers

Message ID 20240329203450.7824-1-tzimmermann@suse.de
Headers show
Series arch: Remove fbdev dependency from video helpers | expand

Message

Thomas Zimmermann March 29, 2024, 8:32 p.m. UTC
Make architecture helpers for display functionality depend on general
video functionality instead of fbdev. This avoids the dependency on
fbdev and makes the functionality available for non-fbdev code.

Patch 1 replaces the variety of Kconfig options that control the
Makefiles with CONFIG_VIDEO. More fine-grained control of the build
can then be done within each video/ directory; see parisc for an
example.

Patch 2 replaces fb_is_primary_device() with video_is_primary_device(),
which has no dependencies on fbdev. The implementation remains identical
on all affected platforms. There's one minor change in fbcon, which is
the only caller of fb_is_primary_device().

Patch 3 renames the source and header files from fbdev to video.

v3:
- arc, arm, arm64, sh, um: generate asm/video.h (Sam, Helge, Arnd)
- fix typos (Sam)
v2:
- improve cover letter
- rebase onto v6.9-rc1

Thomas Zimmermann (3):
  arch: Select fbdev helpers with CONFIG_VIDEO
  arch: Remove struct fb_info from video helpers
  arch: Rename fbdev header and source files

 arch/arc/include/asm/fb.h                    |  8 ------
 arch/arm/include/asm/fb.h                    |  6 -----
 arch/arm64/include/asm/fb.h                  | 10 --------
 arch/loongarch/include/asm/{fb.h => video.h} |  8 +++---
 arch/m68k/include/asm/{fb.h => video.h}      |  8 +++---
 arch/mips/include/asm/{fb.h => video.h}      | 12 ++++-----
 arch/parisc/Makefile                         |  2 +-
 arch/parisc/include/asm/fb.h                 | 14 -----------
 arch/parisc/include/asm/video.h              | 16 ++++++++++++
 arch/parisc/video/Makefile                   |  2 +-
 arch/parisc/video/{fbdev.c => video-sti.c}   |  9 ++++---
 arch/powerpc/include/asm/{fb.h => video.h}   |  8 +++---
 arch/powerpc/kernel/pci-common.c             |  2 +-
 arch/sh/include/asm/fb.h                     |  7 ------
 arch/sparc/Makefile                          |  4 +--
 arch/sparc/include/asm/{fb.h => video.h}     | 15 +++++------
 arch/sparc/video/Makefile                    |  2 +-
 arch/sparc/video/fbdev.c                     | 26 --------------------
 arch/sparc/video/video.c                     | 25 +++++++++++++++++++
 arch/um/include/asm/Kbuild                   |  2 +-
 arch/x86/Makefile                            |  2 +-
 arch/x86/include/asm/fb.h                    | 19 --------------
 arch/x86/include/asm/video.h                 | 21 ++++++++++++++++
 arch/x86/video/Makefile                      |  3 ++-
 arch/x86/video/{fbdev.c => video.c}          | 21 +++++++---------
 drivers/video/fbdev/core/fbcon.c             |  2 +-
 include/asm-generic/Kbuild                   |  2 +-
 include/asm-generic/{fb.h => video.h}        | 17 +++++++------
 include/linux/fb.h                           |  2 +-
 29 files changed, 124 insertions(+), 151 deletions(-)
 delete mode 100644 arch/arc/include/asm/fb.h
 delete mode 100644 arch/arm/include/asm/fb.h
 delete mode 100644 arch/arm64/include/asm/fb.h
 rename arch/loongarch/include/asm/{fb.h => video.h} (86%)
 rename arch/m68k/include/asm/{fb.h => video.h} (86%)
 rename arch/mips/include/asm/{fb.h => video.h} (76%)
 delete mode 100644 arch/parisc/include/asm/fb.h
 create mode 100644 arch/parisc/include/asm/video.h
 rename arch/parisc/video/{fbdev.c => video-sti.c} (78%)
 rename arch/powerpc/include/asm/{fb.h => video.h} (76%)
 delete mode 100644 arch/sh/include/asm/fb.h
 rename arch/sparc/include/asm/{fb.h => video.h} (75%)
 delete mode 100644 arch/sparc/video/fbdev.c
 create mode 100644 arch/sparc/video/video.c
 delete mode 100644 arch/x86/include/asm/fb.h
 create mode 100644 arch/x86/include/asm/video.h
 rename arch/x86/video/{fbdev.c => video.c} (66%)
 rename include/asm-generic/{fb.h => video.h} (89%)

Comments

Thomas Zimmermann April 5, 2024, 9:04 a.m. UTC | #1
Hi,

if there are no further comments, can this series be merged through 
asm-generic?

Best regards
Thomas

Am 29.03.24 um 21:32 schrieb Thomas Zimmermann:
> Make architecture helpers for display functionality depend on general
> video functionality instead of fbdev. This avoids the dependency on
> fbdev and makes the functionality available for non-fbdev code.
>
> Patch 1 replaces the variety of Kconfig options that control the
> Makefiles with CONFIG_VIDEO. More fine-grained control of the build
> can then be done within each video/ directory; see parisc for an
> example.
>
> Patch 2 replaces fb_is_primary_device() with video_is_primary_device(),
> which has no dependencies on fbdev. The implementation remains identical
> on all affected platforms. There's one minor change in fbcon, which is
> the only caller of fb_is_primary_device().
>
> Patch 3 renames the source and header files from fbdev to video.
>
> v3:
> - arc, arm, arm64, sh, um: generate asm/video.h (Sam, Helge, Arnd)
> - fix typos (Sam)
> v2:
> - improve cover letter
> - rebase onto v6.9-rc1
>
> Thomas Zimmermann (3):
>    arch: Select fbdev helpers with CONFIG_VIDEO
>    arch: Remove struct fb_info from video helpers
>    arch: Rename fbdev header and source files
>
>   arch/arc/include/asm/fb.h                    |  8 ------
>   arch/arm/include/asm/fb.h                    |  6 -----
>   arch/arm64/include/asm/fb.h                  | 10 --------
>   arch/loongarch/include/asm/{fb.h => video.h} |  8 +++---
>   arch/m68k/include/asm/{fb.h => video.h}      |  8 +++---
>   arch/mips/include/asm/{fb.h => video.h}      | 12 ++++-----
>   arch/parisc/Makefile                         |  2 +-
>   arch/parisc/include/asm/fb.h                 | 14 -----------
>   arch/parisc/include/asm/video.h              | 16 ++++++++++++
>   arch/parisc/video/Makefile                   |  2 +-
>   arch/parisc/video/{fbdev.c => video-sti.c}   |  9 ++++---
>   arch/powerpc/include/asm/{fb.h => video.h}   |  8 +++---
>   arch/powerpc/kernel/pci-common.c             |  2 +-
>   arch/sh/include/asm/fb.h                     |  7 ------
>   arch/sparc/Makefile                          |  4 +--
>   arch/sparc/include/asm/{fb.h => video.h}     | 15 +++++------
>   arch/sparc/video/Makefile                    |  2 +-
>   arch/sparc/video/fbdev.c                     | 26 --------------------
>   arch/sparc/video/video.c                     | 25 +++++++++++++++++++
>   arch/um/include/asm/Kbuild                   |  2 +-
>   arch/x86/Makefile                            |  2 +-
>   arch/x86/include/asm/fb.h                    | 19 --------------
>   arch/x86/include/asm/video.h                 | 21 ++++++++++++++++
>   arch/x86/video/Makefile                      |  3 ++-
>   arch/x86/video/{fbdev.c => video.c}          | 21 +++++++---------
>   drivers/video/fbdev/core/fbcon.c             |  2 +-
>   include/asm-generic/Kbuild                   |  2 +-
>   include/asm-generic/{fb.h => video.h}        | 17 +++++++------
>   include/linux/fb.h                           |  2 +-
>   29 files changed, 124 insertions(+), 151 deletions(-)
>   delete mode 100644 arch/arc/include/asm/fb.h
>   delete mode 100644 arch/arm/include/asm/fb.h
>   delete mode 100644 arch/arm64/include/asm/fb.h
>   rename arch/loongarch/include/asm/{fb.h => video.h} (86%)
>   rename arch/m68k/include/asm/{fb.h => video.h} (86%)
>   rename arch/mips/include/asm/{fb.h => video.h} (76%)
>   delete mode 100644 arch/parisc/include/asm/fb.h
>   create mode 100644 arch/parisc/include/asm/video.h
>   rename arch/parisc/video/{fbdev.c => video-sti.c} (78%)
>   rename arch/powerpc/include/asm/{fb.h => video.h} (76%)
>   delete mode 100644 arch/sh/include/asm/fb.h
>   rename arch/sparc/include/asm/{fb.h => video.h} (75%)
>   delete mode 100644 arch/sparc/video/fbdev.c
>   create mode 100644 arch/sparc/video/video.c
>   delete mode 100644 arch/x86/include/asm/fb.h
>   create mode 100644 arch/x86/include/asm/video.h
>   rename arch/x86/video/{fbdev.c => video.c} (66%)
>   rename include/asm-generic/{fb.h => video.h} (89%)
>
Arnd Bergmann May 3, 2024, 3:29 p.m. UTC | #2
On Fri, Apr 5, 2024, at 11:04, Thomas Zimmermann wrote:
> Hi,
>
> if there are no further comments, can this series be merged through 
> asm-generic?

Sorry for the delay, I've merged these for asm-generic now.

      Arnd