fbdev: atafb: Fix after kexec, misc. cleanups
cover fbdev: atafb: Fix after kexec, misc. cleanups
Hi all,
This patch series fixes the frame buffer on Atari Falcon when using kexec while blanked, and does some miscellaneous cleanups.
This has been tested on ARAnyM.
Thanks!
Geert Uytterhoeven (4):
fbdev: atafb: Stop printing virtual screen_base
fbdev: atafb: Remove obsolete module support
fbdev: atafb: Fix broken frame buffer after kexec
fbdev: atafb: Modernize printing of kernel messages
drivers/video/fbdev/atafb.c | 67 +++++++++++++++++----------- drivers/video/fbdev/atafb_iplan2p2.c | 23 ---------- drivers/video/fbdev/atafb_iplan2p4.c | 23 ---------- drivers/video/fbdev/atafb_iplan2p8.c | 23 ---------- drivers/video/fbdev/atafb_mfb.c | 23 ---------- 5 files changed, 40 insertions(+), 119 deletions(-)
Signature · 12 lines
2.17.1
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus TorvaldsPATCH 1/4 fbdev: atafb: Stop printing virtual screen_base
Printing (hashed) virtual addresses is useless.
--- drivers/video/fbdev/atafb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/atafb.c +2 -2
@@ -3175,8 +3175,8 @@ int __init atafb_init(void)kernel_set_cachemode (screen_base, screen_len,IOMAP_WRITETHROUGH ); } -printk ("atafb: screen_base %p phys_screen_base %lx screen_len %d\n" , - screen_base, phys_screen_base, screen_len); +printk ("atafb: phys_screen_base %lx screen_len %d\n" , + phys_screen_base, screen_len); #ifdef ATAFB_EXT }else {/* Map the video memory (physical address given) to somewhere
Signature · 1 line
2.17.1
PATCH 2/4 fbdev: atafb: Remove obsolete module support
In reply to Geert UytterhoevenCONFIG_FB_ATARI is bool, hence the Atari frame buffer driver cannot be built as a module. In addition, the module support code refers to a function atafb_deinit(), which never existed.
Replace module_init() by device_initcall().
--- drivers/video/fbdev/atafb.c | 16 +--------------- drivers/video/fbdev/atafb_iplan2p2.c | 23 ----------------------- drivers/video/fbdev/atafb_iplan2p4.c | 23 ----------------------- drivers/video/fbdev/atafb_iplan2p8.c | 23 ----------------------- drivers/video/fbdev/atafb_mfb.c | 23 ----------------------- 5 files changed, 1 insertion(+), 107 deletions(-)
drivers/video/fbdev/atafb.c +1 -15
@@ -47,7 +47,6 @@#define ATAFB_EXT #define ATAFB_FALCON -#include <linux/module.h> #include <linux/kernel.h> #include <linux/errno.h> #include <linux/string.h>
@@ -3078,14 +3077,11 @@ int __init atafb_init(void)int pad, detected_mode, error;unsigned int defmode =0 ;unsigned long mem_req; - -#ifndef MODULE char *option =NULL ;if (fb_get_options ("atafb" , &option))return -ENODEV ;atafb_setup (option); -#endif printk ("atafb_init: start\n" );if (!MACH_IS_ATARI )
@@ -3251,14 +3247,4 @@ int __init atafb_init(void)return 0 ; } -module_init (atafb_init); - -#ifdef MODULE -MODULE_LICENSE ("GPL" ); - -int cleanup_module (void ) -{ -unregister_framebuffer (&fb_info); -return atafb_deinit (); -} -#endif /* MODULE */ +device_initcall (atafb_init);
drivers/video/fbdev/atafb_iplan2p2.c +0 -23
@@ -10,7 +10,6 @@* more details. */ -#include <linux/module.h> #include <linux/string.h> #include <linux/fb.h>
@@ -269,25 +268,3 @@ void atafb_iplan2p2_linefill(struct fb_info *info, u_long next_line,if (width)fill8_2col ((u8 *)dest, fgcolor, bgcolor, *data); } - -#ifdef MODULE -MODULE_LICENSE ("GPL" ); - -int init_module (void ) -{ -return 0 ; -} - -void cleanup_module (void ) -{ -} -#endif /* MODULE */ - - -/* -* Visible symbols for modules -*/ - -EXPORT_SYMBOL (atafb_iplan2p2_copyarea); -EXPORT_SYMBOL (atafb_iplan2p2_fillrect); -EXPORT_SYMBOL (atafb_iplan2p2_linefill);
drivers/video/fbdev/atafb_iplan2p4.c +0 -23
@@ -10,7 +10,6 @@* more details. */ -#include <linux/module.h> #include <linux/string.h> #include <linux/fb.h>
@@ -284,25 +283,3 @@ void atafb_iplan2p4_linefill(struct fb_info *info, u_long next_line,if (width)fill8_2col ((u8 *)dest, fgcolor, bgcolor, *data); } - -#ifdef MODULE -MODULE_LICENSE ("GPL" ); - -int init_module (void ) -{ -return 0 ; -} - -void cleanup_module (void ) -{ -} -#endif /* MODULE */ - - -/* -* Visible symbols for modules -*/ - -EXPORT_SYMBOL (atafb_iplan2p4_copyarea); -EXPORT_SYMBOL (atafb_iplan2p4_fillrect); -EXPORT_SYMBOL (atafb_iplan2p4_linefill);
drivers/video/fbdev/atafb_iplan2p8.c +0 -23
@@ -10,7 +10,6 @@* more details. */ -#include <linux/module.h> #include <linux/string.h> #include <linux/fb.h>
@@ -321,25 +320,3 @@ void atafb_iplan2p8_linefill(struct fb_info *info, u_long next_line,if (width)fill8_2col ((u8 *)dest, fgcolor, bgcolor, *data); } - -#ifdef MODULE -MODULE_LICENSE ("GPL" ); - -int init_module (void ) -{ -return 0 ; -} - -void cleanup_module (void ) -{ -} -#endif /* MODULE */ - - -/* -* Visible symbols for modules -*/ - -EXPORT_SYMBOL (atafb_iplan2p8_copyarea); -EXPORT_SYMBOL (atafb_iplan2p8_fillrect); -EXPORT_SYMBOL (atafb_iplan2p8_linefill);
drivers/video/fbdev/atafb_mfb.c +0 -23
@@ -9,7 +9,6 @@* more details. */ -#include <linux/module.h> #include <linux/string.h> #include <linux/fb.h>
@@ -88,25 +87,3 @@ void atafb_mfb_linefill(struct fb_info *info, u_long next_line, *dest++ = *data++; } } - -#ifdef MODULE -MODULE_LICENSE ("GPL" ); - -int init_module (void ) -{ -return 0 ; -} - -void cleanup_module (void ) -{ -} -#endif /* MODULE */ - - -/* -* Visible symbols for modules -*/ - -EXPORT_SYMBOL (atafb_mfb_copyarea); -EXPORT_SYMBOL (atafb_mfb_fillrect); -EXPORT_SYMBOL (atafb_mfb_linefill);
Signature · 1 line
2.17.1
PATCH 3/4 fbdev: atafb: Fix broken frame buffer after kexec
In reply to Geert UytterhoevenOn Falcon, Atari frame buffer initialization relies on preprogrammed register values. These register values are changed to blank the console.
Hence when using kexec to boot into a new kernel while the console is blanked, the new kernel cannot determine the current video configuration, and the Atari frame buffer driver fails to initialize:
atafb: phys_screen_base 6ce000 screen_len 4096
Fix this by doing a straight-forward conversion of the driver to a platform device driver, and adding a shutdown handler that unblanks the display.
--- drivers/video/fbdev/atafb.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-)
drivers/video/fbdev/atafb.c +30 -4
@@ -54,6 +54,7 @@#include <linux/delay.h> #include <linux/init.h> #include <linux/interrupt.h> +#include <linux/platform_device.h> #include <asm/setup.h> #include <linux/uaccess.h>
@@ -3072,7 +3073,7 @@ int __init atafb_setup(char *options)return 0 ; } -int __init atafb_init (void ) +static int __init atafb_probe (struct platform_device *pdev) {int pad, detected_mode, error;unsigned int defmode =0 ;
@@ -3084,9 +3085,6 @@ int __init atafb_init(void)atafb_setup (option);printk ("atafb_init: start\n" ); -if (!MACH_IS_ATARI ) -return -ENODEV ; - do { #ifdef ATAFB_EXT if (external_addr) {
@@ -3247,4 +3245,32 @@ int __init atafb_init(void)return 0 ; } +static void atafb_shutdown (struct platform_device *pdev) +{ +/* Unblank before kexec */ +if (fbhw->blank) + fbhw->blank (0 ); +} + +static struct platform_driver atafb_driver = { + .shutdown = atafb_shutdown, + .driver = { + .name ="atafb" , + }, +}; + +static int __init atafb_init (void ) +{ +struct platform_device *pdev; + +if (!MACH_IS_ATARI ) +return -ENODEV ; + + pdev =platform_device_register_simple ("atafb" ,-1 ,NULL ,0 ); +if (IS_ERR (pdev)) +return PTR_ERR (pdev); + +return platform_driver_probe (&atafb_driver, atafb_probe); +} +device_initcall (atafb_init);
Signature · 1 line
2.17.1
PATCH 4/4 fbdev: atafb: Modernize printing of kernel messages
In reply to Geert UytterhoevenNow the driver has been converted to a platform driver, the legacy printk() calls without any log level can be replaced by proper dev_*() calls.
--- drivers/video/fbdev/atafb.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
drivers/video/fbdev/atafb.c +13 -12
@@ -3083,12 +3083,12 @@ static int __init atafb_probe(struct platform_device *pdev)if (fb_get_options ("atafb" , &option))return -ENODEV ;atafb_setup (option); -printk ("atafb_init: start\n" ); +dev_dbg (&pdev->dev,"%s: start\n" , __func__); do { #ifdef ATAFB_EXT if (external_addr) { - printk("atafb_init: initializing external hw\n"); + dev_dbg(&pdev->dev, "initializing external hw\n"); fbhw = &ext_switch; atafb_ops.fb_setcolreg = &ext_setcolreg; defmode = DEFMODE_EXT;
@@ -3097,7 +3097,7 @@ static int __init atafb_probe(struct platform_device *pdev)#endif #ifdef ATAFB_TT if (ATARIHW_PRESENT (TT_SHIFTER )) { -printk ("atafb_init: initializing TT hw\n" ); +dev_dbg (&pdev->dev,"initializing TT hw\n" ); fbhw = &tt_switch; atafb_ops.fb_setcolreg = &tt_setcolreg; defmode =DEFMODE_TT ;
@@ -3106,7 +3106,7 @@ static int __init atafb_probe(struct platform_device *pdev)#endif #ifdef ATAFB_FALCON if (ATARIHW_PRESENT (VIDEL_SHIFTER )) { -printk ("atafb_init: initializing Falcon hw\n" ); +dev_dbg (&pdev->dev,"initializing Falcon hw\n" ); fbhw = &falcon_switch; atafb_ops.fb_setcolreg = &falcon_setcolreg; error = request_irq(IRQ_AUTO_4, falcon_vbl_switcher, 0,
@@ -3121,7 +3121,7 @@ static int __init atafb_probe(struct platform_device *pdev)#ifdef ATAFB_STE if (ATARIHW_PRESENT (STND_SHIFTER ) ||ATARIHW_PRESENT (EXTD_SHIFTER )) { -printk ("atafb_init: initializing ST/E hw\n" ); +dev_dbg (&pdev->dev,"initializing ST/E hw\n" ); fbhw = &st_switch; atafb_ops.fb_setcolreg = &stste_setcolreg; defmode =DEFMODE_STE ;
@@ -3129,7 +3129,8 @@ static int __init atafb_probe(struct platform_device *pdev) } fbhw = &st_switch; atafb_ops.fb_setcolreg = &stste_setcolreg; -printk ("Cannot determine video hardware; defaulting to ST(e)\n" ); +dev_warn (&pdev->dev, +"Cannot determine video hardware; defaulting to ST(e)\n" );#else /* ATAFB_STE */ /* no default driver included */ /* Nobody will ever see this message :-) */
@@ -3169,8 +3170,8 @@ static int __init atafb_probe(struct platform_device *pdev)kernel_set_cachemode (screen_base, screen_len,IOMAP_WRITETHROUGH ); } -printk ("atafb: phys_screen_base %lx screen_len %d\n" , - phys_screen_base, screen_len); +dev_info (&pdev->dev,"phys_screen_base %lx screen_len %d\n" , + phys_screen_base, screen_len); #ifdef ATAFB_EXT }else {/* Map the video memory (physical address given) to somewhere
@@ -3217,12 +3218,12 @@ static int __init atafb_probe(struct platform_device *pdev)fb_alloc_cmap (&(fb_info.cmap),1 << fb_info.var.bits_per_pixel,0 ); -printk ("Determined %dx%d, depth %d\n" , - fb_info.var.xres, fb_info.var.yres, fb_info.var.bits_per_pixel); +dev_info (&pdev->dev,"Determined %dx%d, depth %d\n" , fb_info.var.xres, + fb_info.var.yres, fb_info.var.bits_per_pixel);if ((fb_info.var.xres != fb_info.var.xres_virtual) || (fb_info.var.yres != fb_info.var.yres_virtual)) -printk (" virtual %dx%d\n" , fb_info.var.xres_virtual, - fb_info.var.yres_virtual); +dev_info (&pdev->dev," virtual %dx%d\n" , + fb_info.var.xres_virtual, fb_info.var.yres_virtual);if (register_framebuffer (&fb_info) <0 ) {#ifdef ATAFB_EXT
Signature · 1 line
2.17.1
Quoted 15 lines · Geert Uytterhoeven
Hi all,
This patch series fixes the frame buffer on Atari Falcon when using kexec while blanked, and does some miscellaneous cleanups.
This has been tested on ARAnyM.
Thanks!
Geert Uytterhoeven (4):
fbdev: atafb: Stop printing virtualscreen_base
fbdev: atafb: Remove obsolete module support
fbdev: atafb: Fix broken frame buffer after kexec
fbdev: atafb: Modernize printing of kernel messages
Quoted 6 lines
drivers/video/fbdev/atafb.c | 67 +++++++++++++++++----------- drivers/video/fbdev/atafb_iplan2p2.c | 23 ---------- drivers/video/fbdev/atafb_iplan2p4.c | 23 ---------- drivers/video/fbdev/atafb_iplan2p8.c | 23 ---------- drivers/video/fbdev/atafb_mfb.c | 23 ---------- 5 files changed, 40 insertions(+), 119 deletions(-)
Patches #1-4 queued for v5.2, thanks.
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics