sysfb: Fix screen_info type check for VGA
Thomas Zimmermann
maintainerPATCH 1/1 sysfb: Fix screen_info type check for VGA
Use the helper screen_info_video_type() to get the framebuffer type from struct screen_info. Handle supported values in sorted switch statement.
Reading orig_video_isVGA is unreliable. On most systems it is a VIDEO_TYPE_ constant. On some systems with VGA it is simply set to 1 to signal the presence of a VGA output. See vga_probe() for an example. Retrieving the screen_info type with the helper screen_info_video_type() detects these cases and returns the appropriate VIDEO_TYPE_ constant. For VGA, sysfb creates a device named "vga-framebuffer".
The sysfb code has been taken from vga16fb, where it likely didn't work correctly either. With this bugfix applied, vga16fb loads for compatible vga-framebuffer devices.
--- drivers/firmware/sysfb.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
drivers/firmware/sysfb.c +18 -8
@@ -143,6 +143,7 @@ static __init int sysfb_init(void) {struct screen_info *si = &screen_info;struct device *parent; +unsigned int type;struct simplefb_platform_data mode;const char *name;bool compatible;
@@ -170,17 +171,26 @@ static __init int sysfb_init(void) goto put_device; } + type =screen_info_video_type (si); +/* if the FB is incompatible, create a legacy framebuffer device */ -if (si->orig_video_isVGA ==VIDEO_TYPE_EFI ) - name ="efi-framebuffer" ; -else if (si->orig_video_isVGA ==VIDEO_TYPE_VLFB ) - name ="vesa-framebuffer" ; -else if (si->orig_video_isVGA ==VIDEO_TYPE_VGAC ) - name ="vga-framebuffer" ; -else if (si->orig_video_isVGA ==VIDEO_TYPE_EGAC ) +switch (type) { +case VIDEO_TYPE_EGAC : name ="ega-framebuffer" ; -else +break ; +case VIDEO_TYPE_VGAC : + name ="vga-framebuffer" ; +break ; +case VIDEO_TYPE_VLFB : + name ="vesa-framebuffer" ; +break ; +case VIDEO_TYPE_EFI : + name ="efi-framebuffer" ; +break ; +default : name ="platform-framebuffer" ; +break ; + } pd =platform_device_alloc (name,0 );if (!pd) {
Signature · 1 line
2.49.0
Quoted 16 lines · Thomas Zimmermann
Use the helper
screen_info_video_type()to get the framebuffer type from structscreen_info. Handle supported values in sorted switch statement.Reading
orig_video_isVGAis unreliable. On most systems it is aVIDEO_TYPE_constant. On some systems with VGA it is simply set to 1 to signal the presence of a VGA output. Seevga_probe()for an example. Retrieving thescreen_infotype with the helperscreen_info_video_type()detects these cases and returns the appropriateVIDEO_TYPE_constant. For VGA, sysfb creates a device named "vga-framebuffer".The sysfb code has been taken from vga16fb, where it likely didn't work correctly either. With this bugfix applied, vga16fb loads for compatible vga-framebuffer devices.
Quoted 10 lines
Fixes 0db5b61e0dc0 ("fbdev/vga16fb: Create EGA/VGA devices in sysfb code")Cc Thomas Zimmermann <[email protected]>Cc Javier Martinez Canillas <[email protected]>Cc Alex Deucher <[email protected]>Cc Tzung-Bi Shih <[email protected]>Cc Helge Deller <[email protected]>Cc "Uwe Kleine-König" <[email protected]>Cc Zsolt Kajtar <[email protected]>Cc <[email protected]> # v6.1+Signed-off-by Thomas Zimmermann <[email protected]>
Quoted 12 lines · Thomas Zimmermann
Use the helper
screen_info_video_type()to get the framebuffer type from structscreen_info. Handle supported values in sorted switch statement.Reading
orig_video_isVGAis unreliable. On most systems it is aVIDEO_TYPE_constant. On some systems with VGA it is simply set to 1 to signal the presence of a VGA output. Seevga_probe()for an example. Retrieving thescreen_infotype with the helperscreen_info_video_type()detects these cases and returns the appropriateVIDEO_TYPE_constant. For VGA, sysfb creates a device named "vga-framebuffer".
Quoted 4 lines
The sysfb code has been taken from vga16fb, where it likely didn't work correctly either. With this bugfix applied, vga16fb loads for compatible vga-framebuffer devices.
Signature · 5 lines
Best regards, Javier Martinez Canillas Core Platforms Red Hat