Commit 2b78a963 authored by Florian Tobias Schandinat's avatar Florian Tobias Schandinat Committed by Jonathan Corbet
Browse files

viafb: make procfs entries optional 



viafb: make procfs entries optional

This patch adds a config option to enable procfs entries for direct
hardware access. This was the old behaviour but the option defaults
to no as this is really ugly and should not be needed if the driver
works correct (and if it doesn't, it needs to be fixed).
That stuff is really something that should
- not be needed at all (the driver should be capable of doing it)
- not be there (debugfs would be better for such things)
So add this option just for backwards compatiblity.

Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent 2fed547c

drivers/video/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -1522,6 +1522,20 @@ config FB_VIA 
	  To compile this driver as a module, choose M here: the

	  module will be called viafb.



if FB_VIA



config FB_VIA_DIRECT_PROCFS

	bool "direct hardware access via procfs (DEPRECATED)(DANGEROUS)"

	depends on FB_VIA

	default n

	help

	  Allow direct hardware access to some output registers via procfs.

	  This is dangerous but may provide the only chance to get the

	  correct output device configuration.

	  Its use is strongly discouraged.



endif



config FB_NEOMAGIC

	tristate "NeoMagic display support"

	depends on FB && PCI

drivers/video/via/viafbdev.c

+8 −0
Original line number Diff line number Diff line
@@ -1326,6 +1326,8 @@ static void parse_dvi_port(void) 
		  output_interface);

}



#ifdef CONFIG_FB_VIA_DIRECT_PROCFS



/*

 * The proc filesystem read/write function, a simple proc implement to

 * get/set the value of DPA  DVP0,   DVP0DataDriving,  DVP0ClockDriving, DVP1,
@@ -1715,6 +1717,8 @@ static void viafb_remove_proc(struct proc_dir_entry *viafb_entry) 
	remove_proc_entry("viafb", NULL);

}



#endif /* CONFIG_FB_VIA_DIRECT_PROCFS */



static int parse_mode(const char *str, u32 *xres, u32 *yres)

{

	char *ptr;
@@ -1943,7 +1947,9 @@ int __devinit via_fb_pci_probe(struct viafb_dev *vdev) 
		  viafbinfo->node, viafbinfo->fix.id, default_var.xres,

		  default_var.yres, default_var.bits_per_pixel);



#ifdef CONFIG_FB_VIA_DIRECT_PROCFS

	viafb_init_proc(&viaparinfo->shared->proc_entry);

#endif

	viafb_init_dac(IGA2);

	return 0;
@@ -1970,7 +1976,9 @@ void __devexit via_fb_pci_remove(struct pci_dev *pdev) 
	unregister_framebuffer(viafbinfo);

	if (viafb_dual_fb)

		unregister_framebuffer(viafbinfo1);

#ifdef CONFIG_FB_VIA_DIRECT_PROCFS

	viafb_remove_proc(viaparinfo->shared->proc_entry);

#endif

	framebuffer_release(viafbinfo);

	if (viafb_dual_fb)

		framebuffer_release(viafbinfo1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE