diff mbox series

[v3] fbdev: sstfb: Make CONFIG_FB_DEVICE optional and update Kconfig dependency

Message ID 20241015080439.5931-1-gonzalo.silvalde@gmail.com (mailing list archive)
State Accepted, archived
Headers show
Series [v3] fbdev: sstfb: Make CONFIG_FB_DEVICE optional and update Kconfig dependency | expand

Commit Message

Gonzalo Silvalde Blanco Oct. 15, 2024, 8:04 a.m. UTC 
The sstfb driver currently depends on CONFIG_FB_DEVICE to create sysfs
entries and access info->dev. This patch wraps the relevant code blocks
with #ifdef CONFIG_FB_DEVICE, allowing the driver to be built and used
even if CONFIG_FB_DEVICE is not selected.

Additionally, the dependency on CONFIG_FB_DEVICE in the Kconfig file
has been removed for the FB_VOODOO1 driver, allowing it to be selected
independently of the FB_DEVICE option. This is because the sysfs setting
only controls the VGA pass-through state and is not required for the
display to function properly.

For more information on VGA pass-through, see:
http://vogonswiki.com/index.php/VGA_passthrough_cable

Tested by building with and without CONFIG_FB_DEVICE enabled, and both
configurations compiled successfully without issues.

Signed-off-by: Gonzalo Silvalde Blanco <gonzalo.silvalde@gmail.com>
---
 drivers/video/fbdev/Kconfig |  1 -
 drivers/video/fbdev/sstfb.c | 13 ++++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

Comments

Helge Deller Oct. 15, 2024, 8:19 a.m. UTC | #1 
Hi Ganzalo,

Thanks for your updated patch.
Somehow empty lines sneaked in again, see the last line of your patch.
Anyway, I manually fixed up your initial patch with the fixes from
Thomas, so we should be fine now. No need to send a v4...

Thanks!
Helge

On 10/15/24 10:04, Gonzalo Silvalde Blanco wrote:
> The sstfb driver currently depends on CONFIG_FB_DEVICE to create sysfs
> entries and access info->dev. This patch wraps the relevant code blocks
> with #ifdef CONFIG_FB_DEVICE, allowing the driver to be built and used
> even if CONFIG_FB_DEVICE is not selected.
>
> Additionally, the dependency on CONFIG_FB_DEVICE in the Kconfig file
> has been removed for the FB_VOODOO1 driver, allowing it to be selected
> independently of the FB_DEVICE option. This is because the sysfs setting
> only controls the VGA pass-through state and is not required for the
> display to function properly.
>
> For more information on VGA pass-through, see:
> http://vogonswiki.com/index.php/VGA_passthrough_cable
>
> Tested by building with and without CONFIG_FB_DEVICE enabled, and both
> configurations compiled successfully without issues.
>
> Signed-off-by: Gonzalo Silvalde Blanco <gonzalo.silvalde@gmail.com>
> ---
>   drivers/video/fbdev/Kconfig |  1 -
>   drivers/video/fbdev/sstfb.c | 13 ++++++++-----
>   2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
> index ea36c6956bf3..44a8fdbab6df 100644
> --- a/drivers/video/fbdev/Kconfig
> +++ b/drivers/video/fbdev/Kconfig
> @@ -1236,7 +1236,6 @@ config FB_3DFX_I2C
>   config FB_VOODOO1
>   	tristate "3Dfx Voodoo Graphics (sst1) support"
>   	depends on FB && PCI
> -	depends on FB_DEVICE
>   	select FB_IOMEM_HELPERS
>   	help
>   	  Say Y here if you have a 3Dfx Voodoo Graphics (Voodoo1/sst1) or
> diff --git a/drivers/video/fbdev/sstfb.c b/drivers/video/fbdev/sstfb.c
> index f8ae54ca0cc3..1d6ef97f1a84 100644
> --- a/drivers/video/fbdev/sstfb.c
> +++ b/drivers/video/fbdev/sstfb.c
> @@ -716,6 +716,7 @@ static void sstfb_setvgapass( struct fb_info *info, int enable )
>   	pci_write_config_dword(sst_dev, PCI_INIT_ENABLE, tmp);
>   }
>
> +#ifdef CONFIG_FB_DEVICE
>   static ssize_t store_vgapass(struct device *device, struct device_attribute *attr,
>   			const char *buf, size_t count)
>   {
> @@ -736,10 +737,10 @@ static ssize_t show_vgapass(struct device *device, struct device_attribute *attr
>   	struct sstfb_par *par = info->par;
>   	return sprintf(buf, "%d\n", par->vgapass);
>   }
> -
>   static struct device_attribute device_attrs[] = {
>   	__ATTR(vgapass, S_IRUGO|S_IWUSR, show_vgapass, store_vgapass)
> -	};
> +};
> +#endif
>
>   static int sstfb_ioctl(struct fb_info *info, unsigned int cmd,
>   			unsigned long arg)
> @@ -1435,10 +1436,10 @@ static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>   	}
>
>   	sstfb_clear_screen(info);
> -
> +#ifdef CONFIG_FB_DEVICE
>   	if (device_create_file(info->dev, &device_attrs[0]))
>   		printk(KERN_WARNING "sstfb: can't create sysfs entry.\n");
> -
> +#endif
>
>   	fb_info(info, "%s frame buffer device at 0x%p\n",
>   		fix->id, info->screen_base);
> @@ -1467,8 +1468,9 @@ static void sstfb_remove(struct pci_dev *pdev)
>
>   	info = pci_get_drvdata(pdev);
>   	par = info->par;
> -
> +#ifdef CONFIG_FB_DEVICE
>   	device_remove_file(info->dev, &device_attrs[0]);
> +#endif
>   	sst_shutdown(info);
>   	iounmap(info->screen_base);
>   	iounmap(par->mmio_vbase);
> @@ -1536,3 +1538,4 @@ MODULE_PARM_DESC(slowpci, "Uses slow PCI settings (0 or 1) (default=0)");
>   module_param(mode_option, charp, 0);
>   MODULE_PARM_DESC(mode_option, "Initial video mode (default=" DEFAULT_VIDEO_MODE ")");
>
> +
diff mbox series

Patch

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index ea36c6956bf3..44a8fdbab6df 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -1236,7 +1236,6 @@  config FB_3DFX_I2C
 config FB_VOODOO1
 	tristate "3Dfx Voodoo Graphics (sst1) support"
 	depends on FB && PCI
-	depends on FB_DEVICE
 	select FB_IOMEM_HELPERS
 	help
 	  Say Y here if you have a 3Dfx Voodoo Graphics (Voodoo1/sst1) or
diff --git a/drivers/video/fbdev/sstfb.c b/drivers/video/fbdev/sstfb.c
index f8ae54ca0cc3..1d6ef97f1a84 100644
--- a/drivers/video/fbdev/sstfb.c
+++ b/drivers/video/fbdev/sstfb.c
@@ -716,6 +716,7 @@  static void sstfb_setvgapass( struct fb_info *info, int enable )
 	pci_write_config_dword(sst_dev, PCI_INIT_ENABLE, tmp);
 }
 
+#ifdef CONFIG_FB_DEVICE
 static ssize_t store_vgapass(struct device *device, struct device_attribute *attr,
 			const char *buf, size_t count)
 {
@@ -736,10 +737,10 @@  static ssize_t show_vgapass(struct device *device, struct device_attribute *attr
 	struct sstfb_par *par = info->par;
 	return sprintf(buf, "%d\n", par->vgapass);
 }
-
 static struct device_attribute device_attrs[] = {
 	__ATTR(vgapass, S_IRUGO|S_IWUSR, show_vgapass, store_vgapass)
-	};
+};
+#endif
 
 static int sstfb_ioctl(struct fb_info *info, unsigned int cmd,
 			unsigned long arg)
@@ -1435,10 +1436,10 @@  static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	}
 
 	sstfb_clear_screen(info);
-
+#ifdef CONFIG_FB_DEVICE
 	if (device_create_file(info->dev, &device_attrs[0]))
 		printk(KERN_WARNING "sstfb: can't create sysfs entry.\n");
-
+#endif
 
 	fb_info(info, "%s frame buffer device at 0x%p\n",
 		fix->id, info->screen_base);
@@ -1467,8 +1468,9 @@  static void sstfb_remove(struct pci_dev *pdev)
 
 	info = pci_get_drvdata(pdev);
 	par = info->par;
-
+#ifdef CONFIG_FB_DEVICE
 	device_remove_file(info->dev, &device_attrs[0]);
+#endif
 	sst_shutdown(info);
 	iounmap(info->screen_base);
 	iounmap(par->mmio_vbase);
@@ -1536,3 +1538,4 @@  MODULE_PARM_DESC(slowpci, "Uses slow PCI settings (0 or 1) (default=0)");
 module_param(mode_option, charp, 0);
 MODULE_PARM_DESC(mode_option, "Initial video mode (default=" DEFAULT_VIDEO_MODE ")");
 
+