fbdev: Make userspace interfaces optional
Subsystems (17)
Thomas Zimmermann
maintainerv3 cover fbdev: Make userspace interfaces optional
Add the new config option FB_DEVICE. If enabled, fbdev provides traditional userspace interfaces in devfs, sysfs and procfs, such as /dev/fb0 or /proc/fb.
Modern Linux distrobutions have adopted DRM drivers for graphics output and use fbdev only for the kernel's framebuffer console. Userspace has also moved on, with no new fbdev code being written and existing support being removed.
OTOH, fbdev provides userspace a way of accessing kernel or I/O memory, which might compromise the system's security. See the recent commit c8687694bb1f ("drm/fbdev-generic: prohibit potential out-of-bounds access") for an example. Disabling fbdev userspace interfaces is therefore a useful feature to limit unnecessary exposure of fbdev code to processes of low privilegues.
Patches 1 to 31 fix various bugs and issues in fbdev-related code. In most cases the code uses the fbdev device where it should use the Linux hardware device or something else. Most of these patches fix existing problems and should therefore be considered in any case.
Patches 32 to 37 refactor the fbdev core code. The patches move support for backlights, sysfs, procfs and devfs into separate files and hide it behind simple interfaces. These changes will allow to easily build the userspace support conditionally.
Patch 38 introduces the config option FB_DEVICE and adapts the fbdev core to support it. The field struct fb_info.dev is now optional, hence the name of the config option.
Tested on simpledrm and i915, including the device handover.
Future directions: With the support for disabling fbdev userspace interfaces in place, it will be possible to make most fbdev drivers' file-I/O code in struct fb_ops optional as well.
v3:
* add missing file fb_chrdev.c
* fix typo in Kconfig help (Daniel)
v2:
* fix fsl-diu-fb and sh7760fb
* split backlight patches
* set 'default y' for FB_CONFIG
* minor fixes and corrections
Thomas Zimmermann (38):
backlight/bd6107: Compare against struct fb_info.device backlight/bd6107: Rename struct bd6107_platform_data.fbdev to 'dev' backlight/gpio_backlight: Compare against struct fb_info.device backlight/gpio_backlight: Rename field 'fbdev' to 'dev' backlight/lv5207lp: Compare against struct fb_info.device backlight/lv5207lp: Rename struct lv5207lp_platform_data.fbdev to
'dev'
fbdev/atyfb: Reorder backlight and framebuffer init/cleanup fbdev/atyfb: Use hardware device as backlight parent fbdev/aty128fb: Reorder backlight and framebuffer init/cleanup fbdev/aty128fb: Use hardware device as backlight parent fbdev/broadsheetfb: Call device_remove_file() with hardware device fbdev/ep93xx-fb: Alloc DMA memory from hardware device fbdev/ep93xx-fb: Output messages with fb_info() and fb_err() fbdev/ep93xx-fb: Do not assign to struct fb_info.dev fbdev/fsl-diu-fb: Output messages with fb_*() helpers fbdev/mb862xxfb: Output messages with fb_dbg() fbdev/metronomefb: Use hardware device for dev_err() fbdev/nvidiafb: Reorder backlight and framebuffer init/cleanup fbdev/nvidiafb: Use hardware device as backlight parent fbdev/pxa168fb: Do not assign to struct fb_info.dev fbdev/radeonfb: Reorder backlight and framebuffer cleanup fbdev/radeonfb: Use hardware device as backlight parent fbdev/rivafb: Reorder backlight and framebuffer init/cleanup fbdev/rivafb: Use hardware device as backlight parent fbdev/sh7760fb: Use fb_dbg() in sh7760fb_get_color_info() fbdev/sh7760fb: Output messages with fb_dbg() fbdev/sh7760fb: Alloc DMA memory from hardware device fbdev/sh7760fb: Use hardware device with dev_() output during probe fbdev/sm501fb: Output message with fb_err()
fbdev/smscufx: Detect registered fb_info from refcount fbdev/tdfxfb: Set i2c adapter parent to hardware device fbdev/core: Pass Linux device to pm_vt_switch_*() functions fbdev/core: Move framebuffer and backlight helpers into separate files fbdev/core: Add fb_device_{create,destroy}()
fbdev/core: Move procfs code to separate file
fbdev/core: Move file-I/O code into separate file fbdev/core: Rework fb init code
fbdev: Make support for userspace interfaces configurable
Documentation/gpu/todo.rst | 13 + arch/sh/boards/mach-ecovec24/setup.c | 2 +- arch/sh/boards/mach-kfr2r09/setup.c | 2 +- drivers/staging/fbtft/Kconfig | 1 + drivers/video/backlight/bd6107.c | 2 +- drivers/video/backlight/gpio_backlight.c | 6 +- drivers/video/backlight/lv5207lp.c | 2 +- drivers/video/fbdev/Kconfig | 13 + drivers/video/fbdev/aty/aty128fb.c | 12 +- drivers/video/fbdev/aty/atyfb_base.c | 18 +- drivers/video/fbdev/aty/radeon_backlight.c | 2 +- drivers/video/fbdev/aty/radeon_base.c | 3 +- drivers/video/fbdev/broadsheetfb.c | 2 +- drivers/video/fbdev/core/Makefile | 7 +- drivers/video/fbdev/core/fb_backlight.c | 33 ++ drivers/video/fbdev/core/fb_chrdev.c | 485 +++++++++++++++ drivers/video/fbdev/core/fb_info.c | 78 +++ drivers/video/fbdev/core/fb_internal.h | 67 +++ drivers/video/fbdev/core/fb_procfs.c | 62 ++ drivers/video/fbdev/core/fbcon.c | 1 + drivers/video/fbdev/core/fbmem.c | 592 +------------------ drivers/video/fbdev/core/fbsysfs.c | 134 +---- drivers/video/fbdev/ep93xx-fb.c | 21 +- drivers/video/fbdev/fsl-diu-fb.c | 26 +- drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 9 +- drivers/video/fbdev/metronomefb.c | 2 +- drivers/video/fbdev/nvidia/nv_backlight.c | 2 +- drivers/video/fbdev/nvidia/nvidia.c | 8 +- drivers/video/fbdev/omap2/omapfb/Kconfig | 2 +- drivers/video/fbdev/pxa168fb.c | 2 +- drivers/video/fbdev/riva/fbdev.c | 10 +- drivers/video/fbdev/sh7760fb.c | 50 +- drivers/video/fbdev/sm501fb.c | 2 +- drivers/video/fbdev/smscufx.c | 4 +- drivers/video/fbdev/tdfxfb.c | 4 +- include/linux/fb.h | 6 +- include/linux/platform_data/bd6107.h | 2 +- include/linux/platform_data/gpio_backlight.h | 2 +- include/linux/platform_data/lv5207lp.h | 2 +- 39 files changed, 922 insertions(+), 769 deletions(-) create mode 100644 drivers/video/fbdev/core/fb_backlight.c create mode 100644 drivers/video/fbdev/core/fb_chrdev.c create mode 100644 drivers/video/fbdev/core/fb_info.c create mode 100644 drivers/video/fbdev/core/fb_internal.h create mode 100644 drivers/video/fbdev/core/fb_procfs.c
base-commit: 63a468ec7c7652afa80e3fa6ad203f9e64d04e83
prerequisite-patch-id: 0aa359f6144c4015c140c8a6750be19099c676fb
prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24
prerequisite-patch-id: cbc453ee02fae02af22fbfdce56ab732c7a88c36
prerequisite-patch-id: 7c401614cf55c033f742bced317575b9f5b77bb1
prerequisite-patch-id: d3145eae4b35a1290199af6ff6cd5abfebc82033
prerequisite-patch-id: 242b6bc45675f1f1a62572542d75c89d4864f15a
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 1/38 backlight/bd6107: Compare against struct fb_info.device
Struct bd6107_platform_data refers to a platform device within the Linux device hierarchy. The test in bd6107_backlight_check_fb() compares it against the fbdev device in struct fb_info.dev, which is different. Fix the test by comparing to struct fb_info.device.
Fixes a bug in the backlight driver and prepares fbdev for making struct fb_info.dev optional.
v2:
* move renames into separate patch (Javier, Sam, Michael)
--- drivers/video/backlight/bd6107.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/backlight/bd6107.c +1 -1
@@ -104,7 +104,7 @@ static int bd6107_backlight_check_fb(struct backlight_device *backlight, {struct bd6107 *bd =bl_get_data (backlight); -return bd->pdata->fbdev ==NULL || bd->pdata->fbdev == info->dev; +return bd->pdata->fbdev ==NULL || bd->pdata->fbdev == info->device; }static const struct backlight_ops bd6107_backlight_ops = {
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 2/38 backlight/bd6107: Rename struct bd6107_platform_data.fbdev to 'dev'
In reply to Thomas ZimmermannRename struct bd6107_platform_data.fbdev to 'dev', as it stores a pointer to the Linux platform device; not the fbdev device. Makes the code easier to understand.
--- drivers/video/backlight/bd6107.c | 2 +- include/linux/platform_data/bd6107.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/video/backlight/bd6107.c +1 -1
@@ -104,7 +104,7 @@ static int bd6107_backlight_check_fb(struct backlight_device *backlight, {struct bd6107 *bd =bl_get_data (backlight); -return bd->pdata->fbdev ==NULL || bd->pdata->fbdev == info->device; +return !bd->pdata->dev || bd->pdata->dev == info->device; }static const struct backlight_ops bd6107_backlight_ops = {
include/linux/platform_data/bd6107.h +1 -1
@@ -8,7 +8,7 @@struct device ;struct bd6107_platform_data { -struct device *fbdev; +struct device *dev;unsigned int def_value; };
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 3/38 backlight/gpio_backlight: Compare against struct fb_info.device
In reply to Thomas ZimmermannStruct gpio_backlight_platform_data refers to a platform device within the Linux device hierarchy. The test in gpio_backlight_check_fb() compares it against the fbdev device in struct fb_info.dev, which is different. Fix the test by comparing to struct fb_info.device.
Fixes a bug in the backlight driver and prepares fbdev for making struct fb_info.dev optional.
v2:
* move renames into separate patch (Javier, Sam, Michael)
--- drivers/video/backlight/gpio_backlight.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/backlight/gpio_backlight.c +1 -1
@@ -35,7 +35,7 @@ static int gpio_backlight_check_fb(struct backlight_device *bl, {struct gpio_backlight *gbl =bl_get_data (bl); -return gbl->fbdev ==NULL || gbl->fbdev == info->dev; +return gbl->fbdev ==NULL || gbl->fbdev == info->device; }static const struct backlight_ops gpio_backlight_ops = {
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 4/38 backlight/gpio_backlight: Rename field 'fbdev' to 'dev'
In reply to Thomas ZimmermannRename the field 'fbdev' in struct gpio_backlight_platform_data and struct gpio_backlight to 'dev', as they store pointers to the Linux platform device; not the fbdev device. Makes the code easier to understand.
--- arch/sh/boards/mach-ecovec24/setup.c | 2 +- drivers/video/backlight/gpio_backlight.c | 6 +++--- include/linux/platform_data/gpio_backlight.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/sh/boards/mach-ecovec24/setup.c +1 -1
@@ -386,7 +386,7 @@ static struct property_entry gpio_backlight_props[] = { };static struct gpio_backlight_platform_data gpio_backlight_data = { - .fbdev = &lcdc_device.dev, + .dev = &lcdc_device.dev, };static const struct platform_device_info gpio_backlight_device_info = {
drivers/video/backlight/gpio_backlight.c +3 -3
@@ -17,7 +17,7 @@#include <linux/slab.h> struct gpio_backlight { -struct device *fbdev; +struct device *dev;struct gpio_desc *gpiod; };
@@ -35,7 +35,7 @@ static int gpio_backlight_check_fb(struct backlight_device *bl, {struct gpio_backlight *gbl =bl_get_data (bl); -return gbl->fbdev ==NULL || gbl->fbdev == info->device; +return !gbl->dev || gbl->dev == info->device; }static const struct backlight_ops gpio_backlight_ops = {
@@ -59,7 +59,7 @@ static int gpio_backlight_probe(struct platform_device *pdev)return -ENOMEM ;if (pdata) - gbl->fbdev = pdata->fbdev; + gbl->dev = pdata->dev; def_value =device_property_read_bool (dev,"default-on" );
include/linux/platform_data/gpio_backlight.h +1 -1
@@ -8,7 +8,7 @@struct device ;struct gpio_backlight_platform_data { -struct device *fbdev; +struct device *dev; };#endif
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 5/38 backlight/lv5207lp: Compare against struct fb_info.device
In reply to Thomas ZimmermannStruct lv5207lp_platform_data refers to a platform device within the Linux device hierarchy. The test in lv5207lp_backlight_check_fb() compares it against the fbdev device in struct fb_info.dev, which is different. Fix the test by comparing to struct fb_info.device.
Fixes a bug in the backlight driver and prepares fbdev for making struct fb_info.dev optional.
v2:
* move renames into separate patch (Javier, Sam, Michael)
--- drivers/video/backlight/lv5207lp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/backlight/lv5207lp.c +1 -1
@@ -67,7 +67,7 @@ static int lv5207lp_backlight_check_fb(struct backlight_device *backlight, {struct lv5207lp *lv =bl_get_data (backlight); -return lv->pdata->fbdev ==NULL || lv->pdata->fbdev == info->dev; +return lv->pdata->fbdev ==NULL || lv->pdata->fbdev == info->device; }static const struct backlight_ops lv5207lp_backlight_ops = {
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 6/38 backlight/lv5207lp: Rename struct lv5207lp_platform_data.fbdev to 'dev'
In reply to Thomas ZimmermannRename struct lv5207lp_platform_data.fbdev to 'dev', as it stores a pointer to the Linux platform device; not the fbdev device. Makes the code easier to understand.
--- arch/sh/boards/mach-kfr2r09/setup.c | 2 +- drivers/video/backlight/lv5207lp.c | 2 +- include/linux/platform_data/lv5207lp.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/sh/boards/mach-kfr2r09/setup.c +1 -1
@@ -202,7 +202,7 @@ static struct platform_device kfr2r09_sh_lcdc_device = { };static struct lv5207lp_platform_data kfr2r09_backlight_data = { - .fbdev = &kfr2r09_sh_lcdc_device.dev, + .dev = &kfr2r09_sh_lcdc_device.dev, .def_value =13 , .max_value =13 , };
drivers/video/backlight/lv5207lp.c +1 -1
@@ -67,7 +67,7 @@ static int lv5207lp_backlight_check_fb(struct backlight_device *backlight, {struct lv5207lp *lv =bl_get_data (backlight); -return lv->pdata->fbdev ==NULL || lv->pdata->fbdev == info->device; +return !lv->pdata->dev || lv->pdata->dev == info->device; }static const struct backlight_ops lv5207lp_backlight_ops = {
include/linux/platform_data/lv5207lp.h +1 -1
@@ -8,7 +8,7 @@struct device ;struct lv5207lp_platform_data { -struct device *fbdev; +struct device *dev;unsigned int max_value;unsigned int def_value; };
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 7/38 fbdev/atyfb: Reorder backlight and framebuffer init/cleanup
In reply to Thomas ZimmermannThe driver's backlight code requires the framebuffer to be registered. Therefore reorder the init and cleanup calls for both data structures.
--- drivers/video/fbdev/aty/atyfb_base.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/video/fbdev/aty/atyfb_base.c +9 -7
@@ -2654,11 +2654,6 @@ static int aty_init(struct fb_info *info) USE_F32KHZ | TRISTATE_MEM_EN, par); } else#endif -if (M64_HAS (MOBIL_BUS ) && backlight) { -#ifdef CONFIG_FB_ATY_BACKLIGHT -aty_bl_init (par); -#endif - }memset (&var,0 ,sizeof (var));#ifdef CONFIG_PPC
@@ -2751,6 +2746,12 @@ static int aty_init(struct fb_info *info) goto aty_init_exit; } +if (M64_HAS (MOBIL_BUS ) && backlight) { +#ifdef CONFIG_FB_ATY_BACKLIGHT +aty_bl_init (par); +#endif + } + fb_list = info; PRINTKI("fb%d: %s frame buffer device on %s\n",
@@ -3716,12 +3717,13 @@ static void atyfb_remove(struct fb_info *info)aty_set_crtc (par, &par->saved_crtc); par->pll_ops->set_pll (info, &par->saved_pll); -unregister_framebuffer (info); -#ifdef CONFIG_FB_ATY_BACKLIGHT if (M64_HAS (MOBIL_BUS ))aty_bl_exit (info->bl_dev);#endif + +unregister_framebuffer (info); +arch_phys_wc_del (par->wc_cookie);#ifndef __sparc__
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 8/38 fbdev/atyfb: Use hardware device as backlight parent
In reply to Thomas ZimmermannUse the hardware device in struct fb_info.device as parent of the backlight device. Aligns the driver with the rest of the codebase and prepares fbdev for making struct fb_info.dev optional.
--- drivers/video/fbdev/aty/atyfb_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/aty/atyfb_base.c +1 -1
@@ -2255,7 +2255,7 @@ static void aty_bl_init(struct atyfb_par *par)memset (&props,0 ,sizeof (struct backlight_properties )); props.type =BACKLIGHT_RAW ; props.max_brightness =FB_BACKLIGHT_LEVELS -1 ; - bd =backlight_device_register (name, info->dev, par, &aty_bl_data, + bd =backlight_device_register (name, info->device, par, &aty_bl_data, &props);if (IS_ERR (bd)) { info->bl_dev =NULL ;
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 9/38 fbdev/aty128fb: Reorder backlight and framebuffer init/cleanup
In reply to Thomas ZimmermannThe driver's backlight code requires the framebuffer to be registered. Therefore reorder the init and cleanup calls for both data structures.
--- drivers/video/fbdev/aty/aty128fb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/video/fbdev/aty/aty128fb.c +5 -5
@@ -2028,14 +2028,14 @@ static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent) par->asleep =0 ; par->lock_blank =0 ; +if (register_framebuffer (info) <0 ) +return 0 ; +#ifdef CONFIG_FB_ATY128_BACKLIGHT if (backlight)aty128_bl_init (par);#endif -if (register_framebuffer (info) <0 ) -return 0 ; -fb_info (info,"%s frame buffer device on %s\n" , info->fix.id, video_card);
@@ -2167,12 +2167,12 @@ static void aty128_remove(struct pci_dev *pdev) par = info->par; -unregister_framebuffer (info); -#ifdef CONFIG_FB_ATY128_BACKLIGHT aty128_bl_exit (info->bl_dev);#endif +unregister_framebuffer (info); +arch_phys_wc_del (par->wc_cookie);iounmap (par->regbase);iounmap (info->screen_base);
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 10/38 fbdev/aty128fb: Use hardware device as backlight parent
In reply to Thomas ZimmermannUse the hardware device in struct fb_info.device as parent of the backlight device. Aligns the driver with the rest of the codebase and prepares fbdev for making struct fb_info.dev optional.
--- drivers/video/fbdev/aty/aty128fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/aty/aty128fb.c +1 -1
@@ -1846,7 +1846,7 @@ static void aty128_bl_init(struct aty128fb_par *par)memset (&props,0 ,sizeof (struct backlight_properties )); props.type =BACKLIGHT_RAW ; props.max_brightness =FB_BACKLIGHT_LEVELS -1 ; - bd =backlight_device_register (name, info->dev, par, &aty128_bl_data, + bd =backlight_device_register (name, info->device, par, &aty128_bl_data, &props);if (IS_ERR (bd)) { info->bl_dev =NULL ;
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 11/38 fbdev/broadsheetfb: Call device_remove_file() with hardware device
In reply to Thomas ZimmermannCall device_remove_file() with the same device that has been used for device_create_file(), which is the hardware device stored in struct fb_info.device. Prepares fbdev for making struct fb_info.dev optional.
--- drivers/video/fbdev/broadsheetfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/broadsheetfb.c +1 -1
@@ -1200,7 +1200,7 @@ static void broadsheetfb_remove(struct platform_device *dev)if (info) {struct broadsheetfb_par *par = info->par; -device_remove_file (info->dev, &dev_attr_loadstore_waveform); +device_remove_file (info->device, &dev_attr_loadstore_waveform);unregister_framebuffer (info);fb_deferred_io_cleanup (info); par->board->cleanup (par);
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 12/38 fbdev/ep93xx-fb: Alloc DMA memory from hardware device
In reply to Thomas ZimmermannPass the hardware device to the DMA helpers dma_alloc_wc(), dma_mmap_wc() and dma_free_coherent(). The fbdev device that is currently being used is a software device and does not provide DMA memory.
--- drivers/video/fbdev/ep93xx-fb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/video/fbdev/ep93xx-fb.c +4 -4
@@ -312,7 +312,7 @@ static int ep93xxfb_mmap(struct fb_info *info, struct vm_area_struct *vma)unsigned int offset = vma->vm_pgoff <<PAGE_SHIFT ;if (offset < info->fix.smem_len) { -return dma_mmap_wc (info->dev, vma, info->screen_base, +return dma_mmap_wc (info->device, vma, info->screen_base, info->fix.smem_start, info->fix.smem_len); }
@@ -423,7 +423,7 @@ static int ep93xxfb_alloc_videomem(struct fb_info *info)/* Maximum 16bpp -> used memory is maximum x*y*2 bytes */ fb_size =EP93XXFB_MAX_XRES *EP93XXFB_MAX_YRES *2 ; - virt_addr =dma_alloc_wc (info->dev, fb_size, &phys_addr,GFP_KERNEL ); + virt_addr =dma_alloc_wc (info->device, fb_size, &phys_addr,GFP_KERNEL );if (!virt_addr)return -ENOMEM ;
@@ -440,7 +440,7 @@ static int ep93xxfb_alloc_videomem(struct fb_info *info)"has bit 27 set: cannot init framebuffer\n" , phys_addr); -dma_free_coherent (info->dev, fb_size, virt_addr, phys_addr); +dma_free_coherent (info->device, fb_size, virt_addr, phys_addr);return -ENOMEM ; }
@@ -454,7 +454,7 @@ static int ep93xxfb_alloc_videomem(struct fb_info *info)static void ep93xxfb_dealloc_videomem (struct fb_info *info) {if (info->screen_base) -dma_free_coherent (info->dev, info->fix.smem_len, +dma_free_coherent (info->device, info->fix.smem_len, info->screen_base, info->fix.smem_start); }
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 13/38 fbdev/ep93xx-fb: Output messages with fb_info() and fb_err()
In reply to Thomas ZimmermannFix cases were output helpers are called with struct fb_info.dev. Use fb_info() and fb_err() instead.
--- drivers/video/fbdev/ep93xx-fb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/video/fbdev/ep93xx-fb.c +6 -6
@@ -436,9 +436,9 @@ static int ep93xxfb_alloc_videomem(struct fb_info *info)* least. */ if (check_screenpage_bug && phys_addr & (1 <<27 )) { -dev_err (info->dev,"ep93xx framebuffer bug. phys addr (0x%x) " -"has bit 27 set: cannot init framebuffer\n" , - phys_addr); +fb_err (info,"ep93xx framebuffer bug. phys addr (0x%x) " +"has bit 27 set: cannot init framebuffer\n" , + phys_addr);dma_free_coherent (info->device, fb_size, virt_addr, phys_addr);return -ENOMEM ;
@@ -525,7 +525,7 @@ static int ep93xxfb_probe(struct platform_device *pdev) err =fb_find_mode (&info->var, info, video_mode,NULL ,0 ,NULL ,16 );if (err ==0 ) { -dev_err (info->dev,"No suitable video mode found\n" ); +fb_err (info,"No suitable video mode found\n" ); err = -EINVAL ; goto failed_resource; }
@@ -554,8 +554,8 @@ static int ep93xxfb_probe(struct platform_device *pdev)if (err) goto failed_framebuffer; -dev_info (info->dev,"registered. Mode = %dx%d-%d\n" , - info->var.xres, info->var.yres, info->var.bits_per_pixel); +fb_info (info,"registered. Mode = %dx%d-%d\n" , + info->var.xres, info->var.yres, info->var.bits_per_pixel);return 0 ; failed_framebuffer:
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 14/38 fbdev/ep93xx-fb: Do not assign to struct fb_info.dev
In reply to Thomas ZimmermannDo not assing the Linux device to struct fb_info.dev. The call to register_framebuffer() initializes the field to the fbdev device. Drivers should not override its value.
Fixes a bug where the driver incorrectly decreases the hardware device's reference counter and leaks the fbdev device.
v2:
* add Fixes tag (Dan)
--- drivers/video/fbdev/ep93xx-fb.c | 1 - 1 file changed, 1 deletion(-)
drivers/video/fbdev/ep93xx-fb.c +0 -1
@@ -474,7 +474,6 @@ static int ep93xxfb_probe(struct platform_device *pdev)if (!info)return -ENOMEM ; - info->dev = &pdev->dev;platform_set_drvdata (pdev, info); fbi = info->par; fbi->mach_info = mach_info;
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 15/38 fbdev/fsl-diu-fb: Output messages with fb_*() helpers
In reply to Thomas ZimmermannFix cases were output helpers are called with struct fb_info.dev. Use fb_*() helpers instead. Prepares fbdev for making struct fb_info.dev optional.
--- drivers/video/fbdev/fsl-diu-fb.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/video/fbdev/fsl-diu-fb.c +13 -13
@@ -872,7 +872,7 @@ static int map_video_memory(struct fb_info *info) p =alloc_pages_exact (smem_len,GFP_DMA | __GFP_ZERO);if (!p) { -dev_err (info->dev,"unable to allocate fb memory\n" ); +fb_err (info,"unable to allocate fb memory\n" );return -ENOMEM ; }mutex_lock (&info->mm_lock);
@@ -1145,7 +1145,7 @@ static int fsl_diu_set_par(struct fb_info *info)/* Memory allocation for framebuffer */ if (map_video_memory (info)) { -dev_err (info->dev,"unable to allocate fb memory 1\n" ); +fb_err (info,"unable to allocate fb memory 1\n" );return -ENOMEM ; } }
@@ -1277,16 +1277,16 @@ static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd,if (!arg)return -EINVAL ; -dev_dbg (info->dev,"ioctl %08x (dir=%s%s type=%u nr=%u size=%u)\n" , cmd, +fb_dbg (info,"ioctl %08x (dir=%s%s type=%u nr=%u size=%u)\n" , cmd,_IOC_DIR (cmd) & _IOC_READ ?"R" :"" ,_IOC_DIR (cmd) & _IOC_WRITE ?"W" :"" ,_IOC_TYPE (cmd),_IOC_NR (cmd),_IOC_SIZE (cmd));switch (cmd) {case MFB_SET_PIXFMT_OLD : -dev_warn (info->dev, -"MFB_SET_PIXFMT value of 0x%08x is deprecated.\n" , -MFB_SET_PIXFMT_OLD ); +fb_warn (info, +"MFB_SET_PIXFMT value of 0x%08x is deprecated.\n" , +MFB_SET_PIXFMT_OLD ); fallthrough;case MFB_SET_PIXFMT :if (copy_from_user (&pix_fmt, buf,sizeof (pix_fmt)))
@@ -1294,9 +1294,9 @@ static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd, ad->pix_fmt = pix_fmt;break ;case MFB_GET_PIXFMT_OLD : -dev_warn (info->dev, -"MFB_GET_PIXFMT value of 0x%08x is deprecated.\n" , -MFB_GET_PIXFMT_OLD ); +fb_warn (info, +"MFB_GET_PIXFMT value of 0x%08x is deprecated.\n" , +MFB_GET_PIXFMT_OLD ); fallthrough;case MFB_GET_PIXFMT : pix_fmt = ad->pix_fmt;
@@ -1375,7 +1375,7 @@ static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd, }#endif default : -dev_err (info->dev,"unknown ioctl command (0x%08X)\n" , cmd); +fb_err (info,"unknown ioctl command (0x%08X)\n" , cmd);return -ENOIOCTLCMD ; }
@@ -1543,21 +1543,21 @@ static int install_fb(struct fb_info *info) }if (fsl_diu_check_var (&info->var, info)) { -dev_err (info->dev,"fsl_diu_check_var failed\n" ); +fb_err (info,"fsl_diu_check_var failed\n" );unmap_video_memory (info);fb_dealloc_cmap (&info->cmap);return -EINVAL ; }if (register_framebuffer (info) <0 ) { -dev_err (info->dev,"register_framebuffer failed\n" ); +fb_err (info,"register_framebuffer failed\n" );unmap_video_memory (info);fb_dealloc_cmap (&info->cmap);return -EINVAL ; } mfbi->registered =1 ; -dev_info (info->dev,"%s registered successfully\n" , mfbi->id); +fb_info (info,"%s registered successfully\n" , mfbi->id);return 0 ; }
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 16/38 fbdev/mb862xxfb: Output messages with fb_dbg()
In reply to Thomas ZimmermannFix cases were output helpers are called with struct fb_info.dev. Use fb_dbg() instead. Prepares fbdev for making struct fb_info.dev optional.
v2:
* fix another reference to struct fb_info.dev (kernel test reobot)
* remove fb_err() from commit message
--- drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/video/fbdev/mb862xx/mb862xxfbdrv.c +4 -5
@@ -112,8 +112,7 @@ static int mb862xxfb_check_var(struct fb_var_screeninfo *var, {unsigned long tmp; -if (fbi->dev) -dev_dbg (fbi->dev,"%s\n" , __func__); +fb_dbg (fbi,"%s\n" , __func__);/* check if these values fit into the registers */ if (var->hsync_len >255 || var->vsync_len >255 )
@@ -290,7 +289,7 @@ static int mb862xxfb_blank(int mode, struct fb_info *fbi)struct mb862xxfb_par *par = fbi->par;unsigned long reg; -dev_dbg (fbi->dev,"blank mode=%d\n" , mode); +fb_dbg (fbi,"blank mode=%d\n" , mode);switch (mode) {case FB_BLANK_POWERDOWN :
@@ -791,7 +790,7 @@ static void of_platform_mb862xx_remove(struct platform_device *ofdev)resource_size_t res_size =resource_size (par->res);unsigned long reg; -dev_dbg (fbi->dev,"%s release\n" , fbi->fix.id); +fb_dbg (fbi,"%s release\n" , fbi->fix.id);/* display off */ reg =inreg (disp,GC_DCM1 );
@@ -1138,7 +1137,7 @@ static void mb862xx_pci_remove(struct pci_dev *pdev)struct mb862xxfb_par *par = fbi->par;unsigned long reg; -dev_dbg (fbi->dev,"%s release\n" , fbi->fix.id); +fb_dbg (fbi,"%s release\n" , fbi->fix.id);/* display off */ reg =inreg (disp,GC_DCM1 );
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 17/38 fbdev/metronomefb: Use hardware device for dev_err()
In reply to Thomas ZimmermannReplace the use of the fbdev software device, stored in struct fb_info.dev, with the hardware device from struct fb_info.device in load_waveform(). The device is only used for printing errors with dev_err().
This change aligns load_waveform() with the rest of the driver and prepares fbdev for making struct fb_info.dev optional.
--- drivers/video/fbdev/metronomefb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/metronomefb.c +1 -1
@@ -181,7 +181,7 @@ static int load_waveform(u8 *mem, size_t size, int m, int t,int mem_idx =0 ;struct waveform_hdr *wfm_hdr;u8 *metromem = par->metromem_wfm; -struct device *dev = par->info->dev; +struct device *dev = par->info->device;if (user_wfm_size) epd_frame_table[par->dt].wfm_size = user_wfm_size;
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 18/38 fbdev/nvidiafb: Reorder backlight and framebuffer init/cleanup
In reply to Thomas ZimmermannThe driver's backlight code requires the framebuffer to be registered. Therefore reorder the init and cleanup calls for both data structures.
--- drivers/video/fbdev/nvidia/nvidia.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/video/fbdev/nvidia/nvidia.c +4 -4
@@ -1400,14 +1400,14 @@ static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)pci_set_drvdata (pd, info); -if (backlight) -nvidia_bl_init (par); -if (register_framebuffer (info) <0 ) { printk(KERN_ERR PFX "error registering nVidia framebuffer\n"); goto err_out_iounmap_fb; } +if (backlight) +nvidia_bl_init (par); + printk(KERN_INFO PFX"PCI nVidia %s framebuffer (%dMB @ 0x%lX)\n" , info->fix.id,
@@ -1439,9 +1439,9 @@ static void nvidiafb_remove(struct pci_dev *pd)NVTRACE_ENTER (); +nvidia_bl_exit (par);unregister_framebuffer (info); -nvidia_bl_exit (par);arch_phys_wc_del (par->wc_cookie);iounmap (info->screen_base);fb_destroy_modedb (info->monspecs.modedb);
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 19/38 fbdev/nvidiafb: Use hardware device as backlight parent
In reply to Thomas ZimmermannUse the hardware device in struct fb_info.device as parent of the backlight device. Aligns the driver with the rest of the codebase and prepares fbdev for making struct fb_info.dev optional.
--- drivers/video/fbdev/nvidia/nv_backlight.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/nvidia/nv_backlight.c +1 -1
@@ -98,7 +98,7 @@ void nvidia_bl_init(struct nvidia_par *par)memset (&props,0 ,sizeof (struct backlight_properties )); props.type =BACKLIGHT_RAW ; props.max_brightness =FB_BACKLIGHT_LEVELS -1 ; - bd =backlight_device_register (name, info->dev, par, &nvidia_bl_ops, + bd =backlight_device_register (name, info->device, par, &nvidia_bl_ops, &props);if (IS_ERR (bd)) { info->bl_dev =NULL ;
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 20/38 fbdev/pxa168fb: Do not assign to struct fb_info.dev
In reply to Thomas ZimmermannDo not assign the hardware device to struct fb_info.dev. The field references the fbdev software device, which is unrelated.
--- drivers/video/fbdev/pxa168fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/pxa168fb.c +1 -1
@@ -629,7 +629,7 @@ static int pxa168fb_probe(struct platform_device *pdev) fbi = info->par; fbi->info = info; fbi->clk = clk; - fbi->dev = info->dev = &pdev->dev; + fbi->dev = &pdev->dev; fbi->panel_rbswap = mi->panel_rbswap; fbi->is_blanked =0 ; fbi->active = mi->active;
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 21/38 fbdev/radeonfb: Reorder backlight and framebuffer cleanup
In reply to Thomas ZimmermannThe driver's backlight code requires the framebuffer to be registered. Therefore reorder the cleanup calls for both data structures. The init calls are already in the correct order.
--- drivers/video/fbdev/aty/radeon_base.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/video/fbdev/aty/radeon_base.c +1 -2
@@ -2517,9 +2517,8 @@ static void radeonfb_pci_unregister(struct pci_dev *pdev)del_timer_sync (&rinfo->lvds_timer);arch_phys_wc_del (rinfo->wc_cookie); -unregister_framebuffer (info); -radeonfb_bl_exit (rinfo); +unregister_framebuffer (info);iounmap (rinfo->mmio_base);iounmap (rinfo->fb_base);
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 22/38 fbdev/radeonfb: Use hardware device as backlight parent
In reply to Thomas ZimmermannUse the hardware device in struct fb_info.device as parent of the backlight device. Aligns the driver with the rest of the codebase and prepares fbdev for making struct fb_info.dev optional.
v2:
* add Cc: tag (Dan)
--- drivers/video/fbdev/aty/radeon_backlight.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/aty/radeon_backlight.c +1 -1
@@ -147,7 +147,7 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)memset (&props,0 ,sizeof (struct backlight_properties )); props.type =BACKLIGHT_RAW ; props.max_brightness =FB_BACKLIGHT_LEVELS -1 ; - bd =backlight_device_register (name, rinfo->info->dev, pdata, + bd =backlight_device_register (name, rinfo->info->device, pdata, &radeon_bl_data, &props);if (IS_ERR (bd)) { rinfo->info->bl_dev =NULL ;
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 23/38 fbdev/rivafb: Reorder backlight and framebuffer init/cleanup
In reply to Thomas ZimmermannThe driver's backlight code requires the framebuffer to be registered. Therefore reorder the init and cleanup calls for both data structures.
--- drivers/video/fbdev/riva/fbdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/video/fbdev/riva/fbdev.c +4 -4
@@ -2031,9 +2031,6 @@ static int rivafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)pci_set_drvdata (pd, info); -if (backlight) -riva_bl_init (info->par); - ret =register_framebuffer (info);if (ret <0 ) { printk(KERN_ERR PFX
@@ -2041,6 +2038,9 @@ static int rivafb_probe(struct pci_dev *pd, const struct pci_device_id *ent) goto err_iounmap_screen_base; } +if (backlight) +riva_bl_init (info->par); + printk(KERN_INFO PFX"PCI nVidia %s framebuffer ver %s (%dMB @ 0x%lX)\n" , info->fix.id,
@@ -2084,9 +2084,9 @@ static void rivafb_remove(struct pci_dev *pd)kfree (par->EDID);#endif +riva_bl_exit (info);unregister_framebuffer (info); -riva_bl_exit (info);arch_phys_wc_del (par->wc_cookie);iounmap (par->ctrl_base);iounmap (info->screen_base);
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 24/38 fbdev/rivafb: Use hardware device as backlight parent
In reply to Thomas ZimmermannUse the hardware device in struct fb_info.device as parent of the backlight device. Aligns the driver with the rest of the codebase and prepares fbdev for making struct fb_info.dev optional.
--- drivers/video/fbdev/riva/fbdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/riva/fbdev.c +1 -1
@@ -333,7 +333,7 @@ static void riva_bl_init(struct riva_par *par)memset (&props,0 ,sizeof (struct backlight_properties )); props.type =BACKLIGHT_RAW ; props.max_brightness =FB_BACKLIGHT_LEVELS -1 ; - bd =backlight_device_register (name, info->dev, par, &riva_bl_ops, + bd =backlight_device_register (name, info->device, par, &riva_bl_ops, &props);if (IS_ERR (bd)) { info->bl_dev =NULL ;
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 25/38 fbdev/sh7760fb: Use fb_dbg() in sh7760fb_get_color_info()
In reply to Thomas ZimmermannGive struct fb_info to sh7760fb_get_color_info() and use it in call to fb_dbg(). Prepares fbdev for making struct fb_info.dev optional.
--- drivers/video/fbdev/sh7760fb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/video/fbdev/sh7760fb.c +5 -5
@@ -118,7 +118,7 @@ static int sh7760_setcolreg (u_int regno,return 0 ; } -static int sh7760fb_get_color_info (struct device *dev, +static int sh7760fb_get_color_info (struct fb_info *info,u16 lddfr,int *bpp,int *gray) {int lbpp, lgray;
@@ -150,7 +150,7 @@ static int sh7760fb_get_color_info(struct device *dev, lgray =0 ;break ;default : -dev_dbg (dev,"unsupported LDDFR bit depth.\n" ); +fb_dbg (info,"unsupported LDDFR bit depth.\n" );return -EINVAL ; }
@@ -170,7 +170,7 @@ static int sh7760fb_check_var(struct fb_var_screeninfo *var,int ret, bpp;/* get color info from register value */ - ret =sh7760fb_get_color_info (info->dev, par->pd->lddfr, &bpp,NULL ); + ret =sh7760fb_get_color_info (info, par->pd->lddfr, &bpp,NULL );if (ret)return ret;
@@ -222,7 +222,7 @@ static int sh7760fb_set_par(struct fb_info *info) vdln = vm->yres;/* get color info from register value */ - ret =sh7760fb_get_color_info (info->dev, par->pd->lddfr, &bpp, &gray); + ret =sh7760fb_get_color_info (info, par->pd->lddfr, &bpp, &gray);if (ret)return ret;
@@ -381,7 +381,7 @@ static int sh7760fb_alloc_mem(struct fb_info *info)return 0 ;/* get color info from register value */ - ret =sh7760fb_get_color_info (info->dev, par->pd->lddfr, &bpp,NULL ); + ret =sh7760fb_get_color_info (info, par->pd->lddfr, &bpp,NULL );if (ret) {printk (KERN_ERR "colinfo\n" );return ret;
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 26/38 fbdev/sh7760fb: Output messages with fb_dbg()
In reply to Thomas ZimmermannFix cases were output helpers are called with struct fb_info.dev. Use fb_dbg() instead. Prepares fbdev for making struct fb_info.dev optional.
--- drivers/video/fbdev/sh7760fb.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/video/fbdev/sh7760fb.c +13 -13
@@ -207,7 +207,7 @@ static int sh7760fb_set_par(struct fb_info *info)/* rotate only works with xres <= 320 */ if (par->rot && (vm->xres >320 )) { -dev_dbg (info->dev,"rotation disabled due to display size\n" ); +fb_dbg (info,"rotation disabled due to display size\n" ); par->rot =0 ; }
@@ -226,7 +226,7 @@ static int sh7760fb_set_par(struct fb_info *info)if (ret)return ret; -dev_dbg (info->dev,"%dx%d %dbpp %s (orientation %s)\n" , hdcn, +fb_dbg (info,"%dx%d %dbpp %s (orientation %s)\n" , hdcn, vdln, bpp, gray ?"grayscale" :"color" , par->rot ?"rotated" :"normal" );
@@ -306,7 +306,7 @@ static int sh7760fb_set_par(struct fb_info *info)if (((ldmtr &0x003f ) >=LDMTR_DSTN_MONO_8 ) && ((ldmtr &0x003f ) <=LDMTR_DSTN_COLOR_16 )) { -dev_dbg (info->dev," ***** DSTN untested! *****\n" ); +fb_dbg (info," ***** DSTN untested! *****\n" ); dstn_off = stride;if (par->rot)
@@ -326,17 +326,17 @@ static int sh7760fb_set_par(struct fb_info *info)sh7760fb_blank (FB_BLANK_UNBLANK , info);/* panel on! */ -dev_dbg (info->dev,"hdcn : %6d htcn : %6d\n" , hdcn, htcn); -dev_dbg (info->dev,"hsynw : %6d hsynp : %6d\n" , hsynw, hsynp); -dev_dbg (info->dev,"vdln : %6d vtln : %6d\n" , vdln, vtln); -dev_dbg (info->dev,"vsynw : %6d vsynp : %6d\n" , vsynw, vsynp); -dev_dbg (info->dev,"clksrc: %6d clkdiv: %6d\n" , +fb_dbg (info,"hdcn : %6d htcn : %6d\n" , hdcn, htcn); +fb_dbg (info,"hsynw : %6d hsynp : %6d\n" , hsynw, hsynp); +fb_dbg (info,"vdln : %6d vtln : %6d\n" , vdln, vtln); +fb_dbg (info,"vsynw : %6d vsynp : %6d\n" , vsynw, vsynp); +fb_dbg (info,"clksrc: %6d clkdiv: %6d\n" , (par->pd->ldickr >>12 ) &3 , par->pd->ldickr &0x1f ); -dev_dbg (info->dev,"ldpmmr: 0x%04x ldpspr: 0x%04x\n" , par->pd->ldpmmr, +fb_dbg (info,"ldpmmr: 0x%04x ldpspr: 0x%04x\n" , par->pd->ldpmmr, par->pd->ldpspr); -dev_dbg (info->dev,"ldmtr : 0x%04x lddfr : 0x%04x\n" , ldmtr, lddfr); -dev_dbg (info->dev,"ldlaor: %ld\n" , stride); -dev_dbg (info->dev,"ldsaru: 0x%08lx ldsarl: 0x%08lx\n" , sbase, ldsarl); +fb_dbg (info,"ldmtr : 0x%04x lddfr : 0x%04x\n" , ldmtr, lddfr); +fb_dbg (info,"ldlaor: %ld\n" , stride); +fb_dbg (info,"ldsaru: 0x%08lx ldsarl: 0x%08lx\n" , sbase, ldsarl);return 0 ; }
@@ -401,7 +401,7 @@ static int sh7760fb_alloc_mem(struct fb_info *info) }else if (bpp >8 ) vram *=2 ;if ((vram <1 ) || (vram >1024 *2048 )) { -dev_dbg (info->dev,"too much VRAM required. Check settings\n" ); +fb_dbg (info,"too much VRAM required. Check settings\n" );return -ENODEV ; }
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 27/38 fbdev/sh7760fb: Alloc DMA memory from hardware device
In reply to Thomas ZimmermannPass the hardware device to the DMA helpers dma_alloc_coherent() and dma_free_coherent(). The fbdev device that is currently being used is a software device and does not provide DMA memory. Also update the related dev_*() output statements similarly.
--- drivers/video/fbdev/sh7760fb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/video/fbdev/sh7760fb.c +4 -4
@@ -359,7 +359,7 @@ static void sh7760fb_free_mem(struct fb_info *info)if (!info->screen_base)return ; -dma_free_coherent (info->dev, info->screen_size, +dma_free_coherent (info->device, info->screen_size, info->screen_base, par->fbdma); par->fbdma =0 ;
@@ -408,14 +408,14 @@ static int sh7760fb_alloc_mem(struct fb_info *info)if (vram <PAGE_SIZE ) vram =PAGE_SIZE ; - fbmem =dma_alloc_coherent (info->dev, vram, &par->fbdma,GFP_KERNEL ); + fbmem =dma_alloc_coherent (info->device, vram, &par->fbdma,GFP_KERNEL );if (!fbmem)return -ENOMEM ;if ((par->fbdma &SH7760FB_DMA_MASK ) !=SH7760FB_DMA_MASK ) {sh7760fb_free_mem (info); -dev_err (info->dev,"kernel gave me memory at 0x%08lx, which is" +dev_err (info->device,"kernel gave me memory at 0x%08lx, which is" "unusable for the LCDC\n" , (unsigned long )par->fbdma);return -ENOMEM ; }
@@ -486,7 +486,7 @@ static int sh7760fb_probe(struct platform_device *pdev) ret =sh7760fb_alloc_mem (info);if (ret) { -dev_dbg (info->dev,"framebuffer memory allocation failed!\n" ); +dev_dbg (info->device,"framebuffer memory allocation failed!\n" ); goto out_unmap; }
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 28/38 fbdev/sh7760fb: Use hardware device with dev_() output during probe
In reply to Thomas ZimmermannCall output helpers in the probe function with the hardware device. The virtual fbdev device has not been initialized at that point. Also prepares fbdev for making struct fb_info.dev optional.
--- drivers/video/fbdev/sh7760fb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/video/fbdev/sh7760fb.c +3 -3
@@ -450,7 +450,7 @@ static int sh7760fb_probe(struct platform_device *pdev) par->pd = pdev->dev.platform_data;if (!par->pd) { -dev_dbg (info->dev,"no display setup data!\n" ); +dev_dbg (&pdev->dev,"no display setup data!\n" ); ret = -ENODEV ; goto out_fb; }
@@ -519,13 +519,13 @@ static int sh7760fb_probe(struct platform_device *pdev) ret =fb_alloc_cmap (&info->cmap,256 ,0 );if (ret) { -dev_dbg (info->dev,"Unable to allocate cmap memory\n" ); +dev_dbg (&pdev->dev,"Unable to allocate cmap memory\n" ); goto out_mem; } ret =register_framebuffer (info);if (ret <0 ) { -dev_dbg (info->dev,"cannot register fb!\n" ); +dev_dbg (&pdev->dev,"cannot register fb!\n" ); goto out_cmap; }platform_set_drvdata (pdev, info);
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 29/38 fbdev/sm501fb: Output message with fb_err()
In reply to Thomas ZimmermannFix case were dev_err() is being called with struct fb_info.dev. Use fb_err() instead.
--- drivers/video/fbdev/sm501fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/sm501fb.c +1 -1
@@ -1293,7 +1293,7 @@ static int sm501fb_sync(struct fb_info *info) count--;if (count <=0 ) { -dev_err (info->dev,"Timeout waiting for 2d engine sync\n" ); +fb_err (info,"Timeout waiting for 2d engine sync\n" );return 1 ; }return 0 ;
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 30/38 fbdev/smscufx: Detect registered fb_info from refcount
In reply to Thomas ZimmermannDetect registered instances of fb_info by reading the reference counter from struct fb_info.read. Avoids looking at the dev field and prepares fbdev for making struct fb_info.dev optional.
--- drivers/video/fbdev/smscufx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/smscufx.c +2 -2
@@ -1496,7 +1496,7 @@ static int ufx_setup_modes(struct ufx_data *dev, struct fb_info *info,u8 *edid;int i, result =0 , tries =3 ; -if (info->dev)/* only use mutex if info has been registered */ +if (refcount_read (&info->count))/* only use mutex if info has been registered */ mutex_lock (&info->lock); edid =kmalloc (EDID_LENGTH ,GFP_KERNEL );
@@ -1610,7 +1610,7 @@ static int ufx_setup_modes(struct ufx_data *dev, struct fb_info *info,if (edid && (dev->edid != edid))kfree (edid); -if (info->dev) +if (refcount_read (&info->count))mutex_unlock (&info->lock);return result;
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 31/38 fbdev/tdfxfb: Set i2c adapter parent to hardware device
In reply to Thomas ZimmermannUse the 3dfx hardware device from the Linux device hierarchy as parent device of the i2c adapter. Aligns the driver with the rest of the codebase and prepares fbdev for making struct fb_info.dev optional.
--- drivers/video/fbdev/tdfxfb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/tdfxfb.c +2 -2
@@ -1327,8 +1327,8 @@ static void tdfxfb_create_i2c_busses(struct fb_info *info) par->chan[0 ].par = par; par->chan[1 ].par = par; -tdfxfb_setup_ddc_bus (&par->chan[0 ],"Voodoo3-DDC" , info->dev); -tdfxfb_setup_i2c_bus (&par->chan[1 ],"Voodoo3-I2C" , info->dev); +tdfxfb_setup_ddc_bus (&par->chan[0 ],"Voodoo3-DDC" , info->device); +tdfxfb_setup_i2c_bus (&par->chan[1 ],"Voodoo3-I2C" , info->device); }static void tdfxfb_delete_i2c_busses (struct tdfx_par *par)
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 32/38 fbdev/core: Pass Linux device to pm_vt_switch_*() functions
In reply to Thomas ZimmermannPass the Linux device to pm_vt_switch_*() instead of the virtual fbdev device. Prepares fbdev for making struct fb_info.dev optional.
The type of device that is passed to the PM functions does not matter much. It is only a token within the internal list of known devices. The PM functions do not refer to any of the device's properties or its type.
--- drivers/video/fbdev/core/fbmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/video/fbdev/core/fbmem.c +3 -3
@@ -1478,9 +1478,9 @@ static int do_register_framebuffer(struct fb_info *fb_info)INIT_LIST_HEAD (&fb_info->modelist);if (fb_info->skip_vt_switch) -pm_vt_switch_required (fb_info->dev, false); +pm_vt_switch_required (fb_info->device, false);else -pm_vt_switch_required (fb_info->dev, true); +pm_vt_switch_required (fb_info->device, true);fb_var_to_videomode (&mode, &fb_info->var);fb_add_videomode (&mode, &fb_info->modelist);
@@ -1520,7 +1520,7 @@ static void unlink_framebuffer(struct fb_info *fb_info)device_destroy (fb_class,MKDEV (FB_MAJOR , i)); -pm_vt_switch_unregister (fb_info->dev); +pm_vt_switch_unregister (fb_info->device);unbind_console (fb_info);
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 33/38 fbdev/core: Move framebuffer and backlight helpers into separate files
In reply to Thomas ZimmermannMove framebuffer and backlight helpers into separate files. Leave fbsysfs.c to sysfs-related code. No functional changes.
The framebuffer helpers are not in fbmem.c because they are under GPL-2.0-or-later copyright, while fbmem.c is GPL-2.0.
v2:
* include <linux/mutex.h> (Sam)
--- drivers/video/fbdev/core/Makefile | 4 +- drivers/video/fbdev/core/fb_backlight.c | 33 +++++++ drivers/video/fbdev/core/fb_info.c | 78 +++++++++++++++++ drivers/video/fbdev/core/fbsysfs.c | 110 +----------------------- 4 files changed, 115 insertions(+), 110 deletions(-) create mode 100644 drivers/video/fbdev/core/fb_backlight.c create mode 100644 drivers/video/fbdev/core/fb_info.c
drivers/video/fbdev/core/Makefile +3 -1
@@ -1,7 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_FB_NOTIFY) += fb_notify.o obj-$(CONFIG_FB) += fb.o -fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \ +fb-y := fb_backlight.o \ + fb_info.o \ + fbmem.o fbmon.o fbcmap.o fbsysfs.o \ modedb.o fbcvt.o fb_cmdline.o fb_io_fops.o fb-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o
drivers/video/fbdev/core/fb_backlight.c new file +33 -0
@@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include <linux/export.h> +#include <linux/fb.h> +#include <linux/mutex.h> + +#if IS_ENABLED (CONFIG_FB_BACKLIGHT ) +/* +* This function generates a linear backlight curve +* +* 0: off +* 1-7: min +* 8-127: linear from min to max +*/ +void fb_bl_default_curve (struct fb_info *fb_info,u8 off,u8 min,u8 max) +{ +unsigned int i, flat, count, range = (max - min); + +mutex_lock (&fb_info->bl_curve_mutex); + + fb_info->bl_curve[0 ] = off; + +for (flat =1 ; flat < (FB_BACKLIGHT_LEVELS /16 ); ++flat) + fb_info->bl_curve[flat] = min; + + count =FB_BACKLIGHT_LEVELS *15 /16 ; +for (i =0 ; i < count; ++i) + fb_info->bl_curve[flat + i] = min + (range * (i +1 ) / count); + +mutex_unlock (&fb_info->bl_curve_mutex); +} +EXPORT_SYMBOL_GPL (fb_bl_default_curve); +#endif
drivers/video/fbdev/core/fb_info.c new file +78 -0
78 lines not on this page · raw message
drivers/video/fbdev/core/fbsysfs.c +1 -109
124 lines not on this page · raw message
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 34/38 fbdev/core: Add fb_device_{create,destroy}()
In reply to Thomas ZimmermannMove the logic to create and destroy fbdev devices into the new helpers fb_device_create() and fb_device_destroy().
There was a call to fb_cleanup_device() in do_unregister_framebuffer() that was too late. The device had already been removed at this point. Move the call into fb_device_destroy().
Declare the helpers in the new internal header file fb_internal.h, as they are only used within the fbdev core module.
--- drivers/video/fbdev/core/fb_internal.h | 12 ++++++++ drivers/video/fbdev/core/fbmem.c | 21 +++----------- drivers/video/fbdev/core/fbsysfs.c | 38 ++++++++++++++++++++++++-- include/linux/fb.h | 3 -- 4 files changed, 52 insertions(+), 22 deletions(-) create mode 100644 drivers/video/fbdev/core/fb_internal.h
drivers/video/fbdev/core/fb_internal.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _FB_INTERNAL_H +#define _FB_INTERNAL_H + +struct fb_info ; + +/* fbsysfs.c */ +int fb_device_create (struct fb_info *fb_info); +void fb_device_destroy (struct fb_info *fb_info); + +#endif
drivers/video/fbdev/core/fbmem.c +4 -17
@@ -40,6 +40,8 @@#include <video/nomodeset.h> #include <video/vga.h> +#include "fb_internal.h" +/* * Frame buffer device initialization and setup routines */
@@ -1447,14 +1449,7 @@ static int do_register_framebuffer(struct fb_info *fb_info)mutex_init (&fb_info->lock);mutex_init (&fb_info->mm_lock); - fb_info->dev =device_create (fb_class, fb_info->device, -MKDEV (FB_MAJOR , i),NULL ,"fb%d" , i); -if (IS_ERR (fb_info->dev)) { -/* Not fatal */ -printk (KERN_WARNING "Unable to create device for framebuffer %d; errno = %ld\n" , i,PTR_ERR (fb_info->dev)); - fb_info->dev =NULL ; - }else -fb_init_device (fb_info); +fb_device_create (fb_info);if (fb_info->pixmap.addr ==NULL ) { fb_info->pixmap.addr =kmalloc (FBPIXMAPSIZE ,GFP_KERNEL );
@@ -1515,16 +1510,9 @@ static void unlink_framebuffer(struct fb_info *fb_info)if (WARN_ON (i <0 || i >=FB_MAX || registered_fb[i] != fb_info))return ; -if (!fb_info->dev) -return ; - -device_destroy (fb_class,MKDEV (FB_MAJOR , i)); - +fb_device_destroy (fb_info);pm_vt_switch_unregister (fb_info->device); -unbind_console (fb_info); - - fb_info->dev =NULL ; }static void do_unregister_framebuffer (struct fb_info *fb_info)
@@ -1539,7 +1527,6 @@ static void do_unregister_framebuffer(struct fb_info *fb_info)fb_destroy_modelist (&fb_info->modelist); registered_fb[fb_info->node] =NULL ; num_registered_fb--; -fb_cleanup_device (fb_info);#ifdef CONFIG_GUMSTIX_AM200EPD {struct fb_event event;
drivers/video/fbdev/core/fbsysfs.c +36 -2
@@ -8,6 +8,9 @@#include <linux/console.h> #include <linux/fb.h> #include <linux/fbcon.h> +#include <linux/major.h> + +#include "fb_internal.h" #define FB_SYSFS_FLAG_ATTR 1
@@ -435,7 +438,7 @@ static struct device_attribute device_attrs[] = {#endif }; -int fb_init_device (struct fb_info *fb_info) +static int fb_init_device (struct fb_info *fb_info) {int i, error =0 ;
@@ -459,7 +462,7 @@ int fb_init_device(struct fb_info *fb_info)return 0 ; } -void fb_cleanup_device (struct fb_info *fb_info) +static void fb_cleanup_device (struct fb_info *fb_info) {unsigned int i;
@@ -470,3 +473,34 @@ void fb_cleanup_device(struct fb_info *fb_info) fb_info->class_flag &= ~FB_SYSFS_FLAG_ATTR ; } } + +int fb_device_create (struct fb_info *fb_info) +{ +int node = fb_info->node; +dev_t devt =MKDEV (FB_MAJOR , node); +int ret; + + fb_info->dev =device_create (fb_class, fb_info->device, devt,NULL ,"fb%d" , node); +if (IS_ERR (fb_info->dev)) { +/* Not fatal */ + ret =PTR_ERR (fb_info->dev); +pr_warn ("Unable to create device for framebuffer %d; error %d\n" , node, ret); + fb_info->dev =NULL ; + }else { +fb_init_device (fb_info); + } + +return 0 ; +} + +void fb_device_destroy (struct fb_info *fb_info) +{ +dev_t devt =MKDEV (FB_MAJOR , fb_info->node); + +if (!fb_info->dev) +return ; + +fb_cleanup_device (fb_info); +device_destroy (fb_class, devt); + fb_info->dev =NULL ; +}
include/linux/fb.h +0 -3
@@ -735,11 +735,8 @@ static inline bool fb_be_math(struct fb_info *info)#endif /* CONFIG_FB_FOREIGN_ENDIAN */ } -/* drivers/video/fbsysfs.c */ extern struct fb_info *framebuffer_alloc (size_t size,struct device *dev);extern void framebuffer_release (struct fb_info *info); -extern int fb_init_device (struct fb_info *fb_info); -extern void fb_cleanup_device (struct fb_info *head);extern void fb_bl_default_curve (struct fb_info *fb_info,u8 off,u8 min,u8 max);/* drivers/video/fbmon.c */
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 35/38 fbdev/core: Move procfs code to separate file
In reply to Thomas ZimmermannMove fbdev's procfs code into a separate file and contain it in init and cleanup helpers. For the cleanup, replace remove_proc_entry() with proc_remove(). It is equivalent in functionality, but looks more like an inverse of proc_create_seq().
v2:
* document proc_remove() usage (Sam)
* revert unrelated removal of for_each_registered_fb()
--- drivers/video/fbdev/core/Makefile | 1 + drivers/video/fbdev/core/fb_internal.h | 12 ++++- drivers/video/fbdev/core/fb_procfs.c | 62 ++++++++++++++++++++++++++ drivers/video/fbdev/core/fbmem.c | 48 +++----------------- 4 files changed, 80 insertions(+), 43 deletions(-) create mode 100644 drivers/video/fbdev/core/fb_procfs.c
drivers/video/fbdev/core/Makefile +1 -0
@@ -3,6 +3,7 @@ obj-$(CONFIG_FB_NOTIFY) += fb_notify.o obj-$(CONFIG_FB) += fb.o fb-y := fb_backlight.o \ fb_info.o \ + fb_procfs.o \ fbmem.o fbmon.o fbcmap.o fbsysfs.o \ modedb.o fbcvt.o fb_cmdline.o fb_io_fops.o fb-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o
drivers/video/fbdev/core/fb_internal.h +11 -1
@@ -3,7 +3,17 @@#ifndef _FB_INTERNAL_H#define _FB_INTERNAL_H -struct fb_info ; +#include <linux/fb.h> +#include <linux/mutex.h> + +/* fbmem.c */ +extern struct mutex registration_lock; +extern struct fb_info *registered_fb[FB_MAX ]; +extern int num_registered_fb; + +/* fb_procfs.c */ +int fb_init_procfs (void ); +void fb_cleanup_procfs (void );/* fbsysfs.c */ int fb_device_create (struct fb_info *fb_info);
drivers/video/fbdev/core/fb_procfs.c new file +62 -0
62 lines not on this page · raw message
drivers/video/fbdev/core/fbmem.c +6 -42
85 lines not on this page · raw message
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 36/38 fbdev/core: Move file-I/O code into separate file
In reply to Thomas ZimmermannMove fbdev's file-I/O code into a separate file and contain it in init and cleanup helpers. No functional changes.
v3:
* add missing file fb_chrdev.c
v2:
* rename source file (Sam)
* include <linux/compat.h> (Javier, kernel test robot)
--- drivers/video/fbdev/core/Makefile | 1 + drivers/video/fbdev/core/fb_chrdev.c | 485 +++++++++++++++++++++++++ drivers/video/fbdev/core/fb_internal.h | 6 + drivers/video/fbdev/core/fbmem.c | 479 +----------------------- 4 files changed, 498 insertions(+), 473 deletions(-) create mode 100644 drivers/video/fbdev/core/fb_chrdev.c
drivers/video/fbdev/core/Makefile +1 -0
@@ -2,6 +2,7 @@ obj-$(CONFIG_FB_NOTIFY) += fb_notify.o obj-$(CONFIG_FB) += fb.o fb-y := fb_backlight.o \ + fb_chrdev.o \ fb_info.o \ fb_procfs.o \ fbmem.o fbmon.o fbcmap.o fbsysfs.o \
drivers/video/fbdev/core/fb_chrdev.c new file +485 -0
485 lines not on this page · raw message
drivers/video/fbdev/core/fb_internal.h +6 -0
@@ -6,10 +6,16 @@#include <linux/fb.h> #include <linux/mutex.h> +/* fb_devfs.c */ +int fb_register_chrdev (void ); +void fb_unregister_chrdev (void ); +/* fbmem.c */ extern struct mutex registration_lock;extern struct fb_info *registered_fb[FB_MAX ];extern int num_registered_fb; +struct fb_info *get_fb_info (unsigned int idx); +void put_fb_info (struct fb_info *fb_info);/* fb_procfs.c */ int fb_init_procfs (void );
drivers/video/fbdev/core/fbmem.c +6 -473
531 lines not on this page · raw message
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 37/38 fbdev/core: Rework fb init code
In reply to Thomas ZimmermannInit the class "graphics" before the rest of fbdev. Later steps, such as the sysfs code, depend on the class. Also arrange the module's exit code in reverse order.
Unexport the global variable fb_class, which is only shared internally within the fbdev core module.
--- drivers/video/fbdev/core/fb_internal.h | 1 + drivers/video/fbdev/core/fbcon.c | 1 + drivers/video/fbdev/core/fbmem.c | 52 ++++++++++---------------- include/linux/fb.h | 1 - 4 files changed, 22 insertions(+), 33 deletions(-)
drivers/video/fbdev/core/fb_internal.h +1 -0
@@ -11,6 +11,7 @@ int fb_register_chrdev(void);void fb_unregister_chrdev (void );/* fbmem.c */ +extern struct class *fb_class;extern struct mutex registration_lock;extern struct fb_info *registered_fb[FB_MAX ];extern int num_registered_fb;
drivers/video/fbdev/core/fbcon.c +1 -0
@@ -78,6 +78,7 @@#include <asm/irq.h> #include "fbcon.h" +#include "fb_internal.h" /* * FIXME: Locking
drivers/video/fbdev/core/fbmem.c +20 -32
94 lines not on this page · raw message
include/linux/fb.h +0 -1
@@ -609,7 +609,6 @@ extern int fb_new_modelist(struct fb_info *info);extern bool fb_center_logo;extern int fb_logo_count; -extern struct class *fb_class;static inline void lock_fb_info (struct fb_info *info) {
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH v3 38/38 fbdev: Make support for userspace interfaces configurable
In reply to Thomas ZimmermannAdd Kconfig option CONFIG_FB_DEVICE and make the virtual fbdev device optional. If the new option has not been selected, fbdev does not create files in devfs, sysfs or procfs.
Most modern Linux systems run a DRM-based graphics stack that uses the kernel's framebuffer console, but has otherwise deprecated fbdev support. Yet fbdev userspace interfaces are still present.
The option makes it possible to use the fbdev subsystem as console implementation without support for userspace. This closes potential entry points to manipulate kernel or I/O memory via framebuffers. It also prevents the execution of driver code via ioctl or sysfs, both of which might allow malicious software to exploit bugs in the fbdev code.
A small number of fbdev drivers require struct fbinfo.dev to be initialized, usually for the support of sysfs interface. Make these drivers depend on FB_DEVICE. They can later be fixed if necessary.
v3:
* effect -> affect in Kconfig help (Daniel)
v2:
* set FB_DEVICE default to y (Geert)
* comment on {get,put}_device() (Sam)
* Kconfig fixes (Sam)
* add TODO item about FB_DEVICE dependencies (Sam)
--- Documentation/gpu/todo.rst | 13 ++++++++ drivers/staging/fbtft/Kconfig | 1 + drivers/video/fbdev/Kconfig | 13 ++++++++ drivers/video/fbdev/core/Makefile | 7 +++-- drivers/video/fbdev/core/fb_internal.h | 38 ++++++++++++++++++++++++ drivers/video/fbdev/omap2/omapfb/Kconfig | 2 +- include/linux/fb.h | 2 ++ 7 files changed, 72 insertions(+), 4 deletions(-)
Documentation/gpu/todo.rst +13 -0
@@ -452,6 +452,19 @@ Contact: Thomas Zimmermann <[email protected]> Level: Starter +Remove driver dependencies on FB_DEVICE +--------------------------------------- + +A number of fbdev drivers provide attributes via sysfs and therefore depend +on CONFIG_FB_DEVICE to be selected. Review each driver and attempt to make +any dependencies on CONFIG_FB_DEVICE optional. At the minimum, the respective +code in the driver could be conditionalized via ifdef CONFIG_FB_DEVICE. Not +all drivers might be able to drop CONFIG_FB_DEVICE. + +Contact: Thomas Zimmermann <[email protected]> + +Level: Starter + Core refactorings =================
drivers/staging/fbtft/Kconfig +1 -0
@@ -2,6 +2,7 @@ menuconfig FB_TFT tristate "Support for small TFT LCD display modules" depends on FB && SPI + depends on FB_DEVICE depends on GPIOLIB || COMPILE_TEST select FB_SYS_FILLRECT select FB_SYS_COPYAREA
drivers/video/fbdev/Kconfig +13 -0
@@ -57,6 +57,16 @@ config FIRMWARE_EDID combination with certain motherboards and monitors are known to suffer from this problem. +config FB_DEVICE + bool "Provide legacy /dev/fb* device" + depends on FB + default y + help + Say Y here if you want the legacy /dev/fb* device file and + interfaces within sysfs anc procfs. It is only required if you + have userspace programs that depend on fbdev for graphics output. + This does not affect the framebuffer console. If unsure, say N. + config FB_DDC tristate depends on FB
@@ -1545,6 +1555,7 @@ config FB_3DFX_I2C config FB_VOODOO1 tristate "3Dfx Voodoo Graphics (sst1) support" depends on FB && PCI + depends on FB_DEVICE select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
@@ -1863,6 +1874,7 @@ config FB_SH_MOBILE_LCDC tristate "SuperH Mobile LCDC framebuffer support" depends on FB && HAVE_CLK && HAS_IOMEM depends on SUPERH || ARCH_RENESAS || COMPILE_TEST + depends on FB_DEVICE select FB_SYS_FILLRECT select FB_SYS_COPYAREA select FB_SYS_IMAGEBLIT
@@ -1932,6 +1944,7 @@ config FB_SMSCUFX config FB_UDL tristate "Displaylink USB Framebuffer support" depends on FB && USB + depends on FB_DEVICE select FB_MODE_HELPERS select FB_SYS_FILLRECT select FB_SYS_COPYAREA
drivers/video/fbdev/core/Makefile +4 -3
@@ -2,12 +2,13 @@ obj-$(CONFIG_FB_NOTIFY) += fb_notify.o obj-$(CONFIG_FB) += fb.o fb-y := fb_backlight.o \ - fb_chrdev.o \ fb_info.o \ - fb_procfs.o \ - fbmem.o fbmon.o fbcmap.o fbsysfs.o \ + fbmem.o fbmon.o fbcmap.o \ modedb.o fbcvt.o fb_cmdline.o fb_io_fops.o fb-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o +fb-$(CONFIG_FB_DEVICE) += fb_chrdev.o \ + fb_procfs.o \ + fbsysfs.o ifeq ($(CONFIG_FRAMEBUFFER_CONSOLE),y) fb-y += fbcon.o bitblit.o softcursor.o
drivers/video/fbdev/core/fb_internal.h +38 -0
@@ -3,12 +3,22 @@#ifndef _FB_INTERNAL_H#define _FB_INTERNAL_H +#include <linux/device.h> #include <linux/fb.h> #include <linux/mutex.h> /* fb_devfs.c */ +#if defined(CONFIG_FB_DEVICE )int fb_register_chrdev (void );void fb_unregister_chrdev (void ); +#else +static inline int fb_register_chrdev (void ) +{ +return 0 ; +} +static inline void fb_unregister_chrdev (void ) +{ } +#endif /* fbmem.c */ extern struct class *fb_class;
@@ -19,11 +29,39 @@ struct fb_info *get_fb_info(unsigned int idx);void put_fb_info (struct fb_info *fb_info);/* fb_procfs.c */ +#if defined(CONFIG_FB_DEVICE )int fb_init_procfs (void );void fb_cleanup_procfs (void ); +#else +static inline int fb_init_procfs (void ) +{ +return 0 ; +} +static inline void fb_cleanup_procfs (void ) +{ } +#endif /* fbsysfs.c */ +#if defined(CONFIG_FB_DEVICE )int fb_device_create (struct fb_info *fb_info);void fb_device_destroy (struct fb_info *fb_info); +#else +static inline int fb_device_create (struct fb_info *fb_info) +{ +/* +* Acquire a reference on the parent device to avoid +* unplug operations behind our back. With the fbdev +* device enabled, this is performed within register_device(). +*/ +get_device (fb_info->device); + +return 0 ; +} +static inline void fb_device_destroy (struct fb_info *fb_info) +{ +/* Undo the get_device() from fb_device_create() */ +put_device (fb_info->device); +} +#endif #endif
drivers/video/fbdev/omap2/omapfb/Kconfig +1 -1
@@ -5,9 +5,9 @@ config OMAP2_VRFB menuconfig FB_OMAP2 tristate "OMAP2+ frame buffer support" depends on FB + depends on FB_DEVICE depends on DRM_OMAP = n depends on GPIOLIB - select FB_OMAP2_DSS select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3 select FB_CFB_FILLRECT
include/linux/fb.h +2 -0
@@ -481,7 +481,9 @@ struct fb_info {const struct fb_ops *fbops;struct device *device;/* This is the parent */ +#if defined(CONFIG_FB_DEVICE )struct device *dev;/* This is this fb device */ +#endif int class_flag;/* private sysfs flags */ #ifdef CONFIG_FB_TILEBLITTING struct fb_tile_ops *tileops;/* Tile Blitting */
Signature · 1 line
2.41.0
Lee Jones
maintainerRe: [PATCH v3 01/38] backlight/bd6107: Compare against struct fb_info.device
In reply to Thomas ZimmermannQuoted 22 lines · Thomas Zimmermann
Struct
bd6107_platform_datarefers to a platform device within the Linux device hierarchy. The test inbd6107_backlight_check_fb()compares it against the fbdev device in struct fb_info.dev, which is different. Fix the test by comparing to struct fb_info.device.Fixes a bug in the backlight driver and prepares fbdev for making struct fb_info.dev optional.
v2:
* move renames into separate patch (Javier, Sam, Michael)Fixes 67b43e590415 ("backlight: Add ROHM BD6107 backlight driver")Signed-off-by Thomas Zimmermann <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Lee Jones <[email protected]>Cc Daniel Thompson <[email protected]>Cc Jingoo Han <[email protected]>Cc <[email protected]> # v3.12+Reviewed-by Javier Martinez Canillas <[email protected]>Reviewed-by Sam Ravnborg <[email protected]>Reviewed-by Daniel Thompson <[email protected]>
Quoted 3 lines
--- drivers/video/backlight/bd6107.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Can the Backlight patches be applied without the others and visa versa?
Signature · 1 line
Lee Jones [李琼斯]
Thomas Zimmermann
maintainerRe: [PATCH v3 01/38] backlight/bd6107: Compare against struct fb_info.device
Hi
Am 14.06.23 um 15:51 schrieb Lee Jones:
Quoted 28 lines · Thomas Zimmermann
Quoted 23 lines
Struct
bd6107_platform_datarefers to a platform device within the Linux device hierarchy. The test inbd6107_backlight_check_fb()compares it against the fbdev device in struct fb_info.dev, which is different. Fix the test by comparing to struct fb_info.device.Fixes a bug in the backlight driver and prepares fbdev for making struct fb_info.dev optional.
v2:
* move renames into separate patch (Javier, Sam, Michael)Fixes 67b43e590415 ("backlight: Add ROHM BD6107 backlight driver")Signed-off-by Thomas Zimmermann <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Lee Jones <[email protected]>Cc Daniel Thompson <[email protected]>Cc Jingoo Han <[email protected]>Cc <[email protected]> # v3.12+Reviewed-by Javier Martinez Canillas <[email protected]>Reviewed-by Sam Ravnborg <[email protected]>Reviewed-by Daniel Thompson <[email protected]>Quoted 3 lines
--- drivers/video/backlight/bd6107.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 1 line
Can the Backlight patches be applied without the others and visa versa?
Unfortunately not. The rest of the series requires the backlight patches.
Best regards
Thomas
Quoted 1 line
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
Thomas Zimmermann
maintainerRe: [PATCH v3 01/38] backlight/bd6107: Compare against struct fb_info.device
Hi Lee
Am 14.06.23 um 16:13 schrieb Thomas Zimmermann:
[...]
Quoted 3 lines
Quoted 1 line
Can the Backlight patches be applied without the others and visa versa?
Unfortunately not. The rest of the series requires the backlight patches.
Are you OK with the patches going through drm?
Best regards
Thomas
Quoted 6 lines
Best regards
ThomasQuoted 1 line
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
Lee Jones
maintainerRe: [PATCH v3 01/38] backlight/bd6107: Compare against struct fb_info.device
Quoted 9 lines · Thomas Zimmermann
Hi Lee
Am 14.06.23 um 16:13 schrieb Thomas Zimmermann:
[...]Quoted 3 lines
Quoted 1 line
Can the Backlight patches be applied without the others and visa versa?
Unfortunately not. The rest of the series requires the backlight patches.
Are you OK with the patches going through drm?
Shouldn't be an issue.
Please ensure my Ack is added to each patch, even if you have to RESEND.
Signature · 1 line
Lee Jones [李琼斯]
Quoted 86 lines · Thomas Zimmermann
Add the new config option
FB_DEVICE. If enabled, fbdev provides traditional userspace interfaces in devfs, sysfs and procfs, such as/dev/fb0or/proc/fb.Modern Linux distrobutions have adopted DRM drivers for graphics output and use fbdev only for the kernel's framebuffer console. Userspace has also moved on, with no new fbdev code being written and existing support being removed.
OTOH, fbdev provides userspace a way of accessing kernel or I/O memory, which might compromise the system's security. See the recent commit
c8687694bb1f("drm/fbdev-generic: prohibit potential out-of-bounds access") for an example. Disabling fbdev userspace interfaces is therefore a useful feature to limit unnecessary exposure of fbdev code to processes of low privilegues.Patches 1 to 31 fix various bugs and issues in fbdev-related code. In most cases the code uses the fbdev device where it should use the Linux hardware device or something else. Most of these patches fix existing problems and should therefore be considered in any case.
Patches 32 to 37 refactor the fbdev core code. The patches move support for backlights, sysfs, procfs and devfs into separate files and hide it behind simple interfaces. These changes will allow to easily build the userspace support conditionally.
Patch 38 introduces the config option
FB_DEVICEand adapts the fbdev core to support it. The field struct fb_info.dev is now optional, hence the name of the config option.Tested on simpledrm and i915, including the device handover.
Future directions: With the support for disabling fbdev userspace interfaces in place, it will be possible to make most fbdev drivers' file-I/O code in struct
fb_opsoptional as well.v3:
* add missing filefb_chrdev.c
* fix typo inKconfighelp (Daniel)
v2:
* fix fsl-diu-fb and sh7760fb
* split backlight patches
* set 'default y' forFB_CONFIG
* minor fixes and correctionsThomas Zimmermann (38):
backlight/bd6107: Compare against struct fb_info.device backlight/bd6107: Rename struct bd6107_platform_data.fbdev to 'dev' backlight/gpio_backlight: Compare against struct fb_info.device backlight/gpio_backlight: Rename field 'fbdev' to 'dev' backlight/lv5207lp: Compare against struct fb_info.device backlight/lv5207lp: Rename struct lv5207lp_platform_data.fbdev to'dev'fbdev/atyfb: Reorder backlight and framebuffer init/cleanup fbdev/atyfb: Use hardware device as backlight parent fbdev/aty128fb: Reorder backlight and framebuffer init/cleanup fbdev/aty128fb: Use hardware device as backlight parent fbdev/broadsheetfb: Call
device_remove_file()with hardware device fbdev/ep93xx-fb: Alloc DMA memory from hardware device fbdev/ep93xx-fb: Output messages withfb_info()andfb_err()fbdev/ep93xx-fb: Do not assign to struct fb_info.dev fbdev/fsl-diu-fb: Output messages with fb_*() helpers fbdev/mb862xxfb: Output messages withfb_dbg()fbdev/metronomefb: Use hardware device fordev_err()fbdev/nvidiafb: Reorder backlight and framebuffer init/cleanup fbdev/nvidiafb: Use hardware device as backlight parent fbdev/pxa168fb: Do not assign to struct fb_info.dev fbdev/radeonfb: Reorder backlight and framebuffer cleanup fbdev/radeonfb: Use hardware device as backlight parent fbdev/rivafb: Reorder backlight and framebuffer init/cleanup fbdev/rivafb: Use hardware device as backlight parent fbdev/sh7760fb: Usefb_dbg()insh7760fb_get_color_info()fbdev/sh7760fb: Output messages withfb_dbg()fbdev/sh7760fb: Alloc DMA memory from hardware device fbdev/sh7760fb: Use hardware device withdev_()output during probe fbdev/sm501fb: Output message withfb_err()
fbdev/smscufx: Detect registeredfb_infofrom refcount fbdev/tdfxfb: Set i2c adapter parent to hardware device fbdev/core: Pass Linux device to pm_vt_switch_*() functions fbdev/core: Move framebuffer and backlight helpers into separate files fbdev/core: Add fb_device_{create,destroy}()
fbdev/core: Move procfs code to separate file
fbdev/core: Move file-I/O code into separate file fbdev/core: Rework fb init code
fbdev: Make support for userspace interfaces configurable
Quoted 8 lines
Documentation/gpu/todo.rst | 13 + arch/sh/boards/mach-ecovec24/setup.c | 2 +- arch/sh/boards/mach-kfr2r09/setup.c | 2 +- drivers/staging/fbtft/Kconfig | 1 +drivers/video/backlight/bd6107.c | 2 +- drivers/video/backlight/gpio_backlight.c | 6 +- drivers/video/backlight/lv5207lp.c | 2 +-
Signature · 1 line
Lee Jones [李琼斯]
Thomas Zimmermann
maintainerRe: [PATCH v3 01/38] backlight/bd6107: Compare against struct fb_info.device
In reply to Lee JonesAm 19.06.23 um 10:31 schrieb Lee Jones:
Quoted 8 lines · Thomas Zimmermann
Quoted 7 lines
Hi Lee
Am 14.06.23 um 16:13 schrieb Thomas Zimmermann:
[...]Quoted 2 lines
Quoted 1 line
Can the Backlight patches be applied without the others and visa versa?
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Unfortunately not. The rest of the series requires the backlight patches.
Are you OK with the patches going through drm?
Shouldn't be an issue.
Please ensure my Ack is added to each patch, even if you have to RESEND.
Thank you so much.
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
Re: [PATCH v3 27/38] fbdev/sh7760fb: Alloc DMA memory from hardware device
In reply to Thomas ZimmermannQuoted 7 lines · Thomas Zimmermann
Pass the hardware device to the DMA helpers
dma_alloc_coherent()anddma_free_coherent(). The fbdev device that is currently being used is a software device and does not provide DMA memory. Also update the related dev_*() output statements similarly.Signed-off-by Thomas Zimmermann <[email protected]>---
Signature · 5 lines
Best regards, Javier Martinez Canillas Core Platforms Red Hat