fbdev/sis: Remove dependency on screen_info
Subsystems (2)
PATCH 1/1 fbdev/sis: Remove dependency on screen_info
When built-in, the sis driver tries to detect the current display mode from the global screen_info state. That state is only for architecture and firmware code. Drivers should not use it directly as it's not guaranteed to contain valid information.
Remove the mode-detection code from sis. Drivers that want to detect a pre-set mode on probe should read the hardware registers directly.
--- drivers/video/fbdev/sis/sis_main.c | 37 ------------------------------ 1 file changed, 37 deletions(-)
drivers/video/fbdev/sis/sis_main.c +0 -37
@@ -27,7 +27,6 @@#include <linux/errno.h> #include <linux/string.h> #include <linux/mm.h> -#include <linux/screen_info.h> #include <linux/slab.h> #include <linux/fb.h> #include <linux/selection.h>
@@ -257,36 +256,6 @@ static void sisfb_search_mode(char *name, bool quiet)printk (KERN_ERR "sisfb: Invalid mode '%s'\n" , nameptr); } -#ifndef MODULE -static void sisfb_get_vga_mode_from_kernel (void ) -{ -#ifdef CONFIG_X86 -char mymode[32 ]; -int mydepth = screen_info.lfb_depth; - -if (screen_info.orig_video_isVGA !=VIDEO_TYPE_VLFB )return ; - -if ( (screen_info.lfb_width >=320 ) && (screen_info.lfb_width <=2048 ) && - (screen_info.lfb_height >=200 ) && (screen_info.lfb_height <=1536 ) && - (mydepth >=8 ) && (mydepth <=32 ) ) { - -if (mydepth ==24 ) mydepth =32 ; - -sprintf (mymode,"%ux%ux%u" , screen_info.lfb_width, - screen_info.lfb_height, - mydepth); - -printk (KERN_DEBUG -"sisfb: Using vga mode %s pre-set by kernel as default\n" , - mymode); - -sisfb_search_mode (mymode, true); - } -#endif -return ; -} -#endif -static void __init sisfb_search_crt2type (const char *name) {
@@ -5901,12 +5870,6 @@ static int sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ivideo->subsysvendor = pdev->subsystem_vendor; ivideo->subsysdevice = pdev->subsystem_device; -#ifndef MODULE -if (sisfb_mode_idx ==-1 ) { -sisfb_get_vga_mode_from_kernel (); - } -#endif - ivideo->chip = chipinfo->chip; ivideo->chip_real_id = chipinfo->chip; ivideo->sisvga_engine = chipinfo->vgaengine;
base-commit: 25232eb8a9ac7fa0dac7e846a4bf7fba2b6db39a
Signature · 1 line
2.43.0
Quoted 5 lines · Thomas Zimmermann
When built-in, the sis driver tries to detect the current display mode from the global
screen_infostate. That state is only for architecture and firmware code. Drivers should not use it directly as it's not guaranteed to contain valid information.
Quoted 7 lines
Remove the mode-detection code from sis. Drivers that want to detect a pre-set mode on probe should read the hardware registers directly.
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/video/fbdev/sis/sis_main.c | 37 ------------------------------ 1 file changed, 37 deletions(-)
applied to fbdev git tree.
Thanks!
Helge