[PATCH 2/4] fbdev: Fix lockup when switching to/from X/console
DORMANTno replies
From: Antonino A. Daplas <hidden>
Date: 2004-11-21 23:20:33
- Do a set_par very late instead of during fbcon_blank by setting the FBINFO_MISC_MODESWITCHLATE flag which should help prevent lockups when switching from X - Shorten chipset names that were missed before - Do not validate modeline if monitor specifications are not available Signed-off-by: Antonino Daplas <redacted> --- savagefb.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff -Nru a/drivers/video/savage/savagefb.c b/drivers/video/savage/savagefb.c
--- a/drivers/video/savage/savagefb.c 2004-11-17 18:15:21 +08:00
+++ b/drivers/video/savage/savagefb.c 2004-11-22 06:44:00 +08:00@@ -719,7 +719,8 @@ return -EINVAL; } - if (!fb_validate_mode(var, info)) + if (!info->monspecs.hfmax || !info->monspecs.vfmax || + !info->monspecs.dclkmax || !fb_validate_mode(var, info)) mode_valid = 1; /* calculate modeline if supported by monitor */
@@ -1801,23 +1802,23 @@ switch (info->fix.accel) { case FB_ACCEL_SUPERSAVAGE: par->chip = S3_SUPERSAVAGE; - snprintf (info->fix.id, 16, "S3 SuperSavage"); + snprintf (info->fix.id, 16, "SuperSavage"); break; case FB_ACCEL_SAVAGE4: par->chip = S3_SAVAGE4; - snprintf (info->fix.id, 16, "S3 Savage4"); + snprintf (info->fix.id, 16, "Savage4"); break; case FB_ACCEL_SAVAGE3D: par->chip = S3_SAVAGE3D; - snprintf (info->fix.id, 16, "S3 Savage3D"); + snprintf (info->fix.id, 16, "Savage3D"); break; case FB_ACCEL_SAVAGE3D_MV: par->chip = S3_SAVAGE3D; - snprintf (info->fix.id, 16, "S3 Savage3D-MV"); + snprintf (info->fix.id, 16, "Savage3D-MV"); break; case FB_ACCEL_SAVAGE2000: par->chip = S3_SAVAGE2000; - snprintf (info->fix.id, 16, "S3 Savage2000"); + snprintf (info->fix.id, 16, "Savage2000"); break; case FB_ACCEL_SAVAGE_MX_MV: par->chip = S3_SAVAGE_MX;
@@ -1882,7 +1883,8 @@ info->fbops = &savagefb_ops; info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN | - FBINFO_HWACCEL_XPAN; + FBINFO_HWACCEL_XPAN | + FBINFO_MISC_MODESWITCHLATE; info->pseudo_palette = par->pseudo_palette; -------------------------------------------------------
SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://productguide.itmanagersjournal.com/