leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] atyfb: Reduce verbosity

Browse Source 
Don't complain about invalid modes when FB_ACTIVATE_TEST is used.

Signed-off-by: Ville Syrjälä <syrjala@sci.fi>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Ville Syrjl 2006-01-09 20:53:22 -08:00 committed by Linus Torvalds
parent cd4617bef4
commit 866d84cec0
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/video/aty/atyfb_base.c
View File

@ -109,9 +109,18 @@
#define GUI_RESERVE (1 * PAGE_SIZE) #define GUI_RESERVE (1 * PAGE_SIZE)
/* FIXME: remove the FAIL definition */ /* FIXME: remove the FAIL definition */
#define FAIL(msg) do { printk(KERN_CRIT "atyfb: " msg "\n"); return -EINVAL; } while (0) #define FAIL(msg) do { \
#define FAIL_MAX(msg, x, _max_) do { if(x > _max_) { printk(KERN_CRIT "atyfb: " msg " %x(%x)\n", x, _max_); return -EINVAL; } } while (0) if (!(var->activate & FB_ACTIVATE_TEST)) \
printk(KERN_CRIT "atyfb: " msg "\n"); \
return -EINVAL; \
} while (0)
#define FAIL_MAX(msg, x, _max_) do { \
if (x > _max_) { \
if (!(var->activate & FB_ACTIVATE_TEST)) \
printk(KERN_CRIT "atyfb: " msg " %x(%x)\n", x, _max_); \
return -EINVAL; \
} \
} while (0)
#ifdef DEBUG #ifdef DEBUG
#define DPRINTK(fmt, args...) printk(KERN_DEBUG "atyfb: " fmt, ## args) #define DPRINTK(fmt, args...) printk(KERN_DEBUG "atyfb: " fmt, ## args)
#else #else
@ -840,11 +849,14 @@ static int aty_var_to_crtc(const struct fb_info *info,
know if one is connected. So it's better to fail then. know if one is connected. So it's better to fail then.
*/ */
if (crtc->lcd_gen_cntl & CRT_ON) { if (crtc->lcd_gen_cntl & CRT_ON) {
PRINTKI("Disable LCD panel, because video mode does not fit.\n"); if (!(var->activate & FB_ACTIVATE_TEST))
PRINTKI("Disable LCD panel, because video mode does not fit.\n");
crtc->lcd_gen_cntl &= ~LCD_ON; crtc->lcd_gen_cntl &= ~LCD_ON;
/*aty_st_lcd(LCD_GEN_CNTL, crtc->lcd_gen_cntl, par);*/ /*aty_st_lcd(LCD_GEN_CNTL, crtc->lcd_gen_cntl, par);*/
} else { } else {
FAIL("Video mode exceeds size of LCD panel.\nConnect this computer to a conventional monitor if you really need this mode."); if (!(var->activate & FB_ACTIVATE_TEST))
PRINTKE("Video mode exceeds size of LCD panel.\nConnect this computer to a conventional monitor if you really need this mode.\n");
return -EINVAL;
} }
} }
} }
@ -1184,7 +1196,8 @@ static int aty_crtc_to_var(const struct crtc *crtc, struct fb_var_screeninfo *va
var->transp.length = 8; var->transp.length = 8;
break; break;
default: default:
FAIL("Invalid pixel width"); PRINTKE("Invalid pixel width\n");
return -EINVAL;
} }
/* output */ /* output */
@ -1241,7 +1254,8 @@ static int atyfb_set_par(struct fb_info *info)
pixclock = atyfb_get_pixclock(var, par); pixclock = atyfb_get_pixclock(var, par);
if (pixclock == 0) { if (pixclock == 0) {
FAIL("Invalid pixclock"); PRINTKE("Invalid pixclock\n");
return -EINVAL;
} else { } else {
if((err = par->pll_ops->var_to_pll(info, pixclock, var->bits_per_pixel, &par->pll))) if((err = par->pll_ops->var_to_pll(info, pixclock, var->bits_per_pixel, &par->pll)))
return err; return err;
@ -1446,7 +1460,9 @@ static int atyfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
pixclock = atyfb_get_pixclock(var, par); pixclock = atyfb_get_pixclock(var, par);
if (pixclock == 0) { if (pixclock == 0) {
FAIL("Invalid pixclock"); if (!(var->activate & FB_ACTIVATE_TEST))
PRINTKE("Invalid pixclock\n");
return -EINVAL;
} else { } else {
if((err = par->pll_ops->var_to_pll(info, pixclock, var->bits_per_pixel, &pll))) if((err = par->pll_ops->var_to_pll(info, pixclock, var->bits_per_pixel, &pll)))
return err; return err;