diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-11-21 15:53:57 -0500 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-12-03 17:03:32 -0500 |
commit | 03c740a04c8da4204ec6e7c6206e1d8a4a429dbe (patch) | |
tree | 3cb24120d5c515bdb1ce29069d98e88171d289a6 /drivers/video | |
parent | 423a53086ce4095ee66e95778dbbcd6d8c7f3529 (diff) |
fbdev/amifb: Store monitor limits in separate __initdata variables
The static fb_info will go away soon.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/amifb.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index 421c1f9d74ab..13e7a179f8d4 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c | |||
@@ -961,6 +961,11 @@ static int round_down_bpp = 1; /* for mode probing */ | |||
961 | static int amifb_ilbm = 0; /* interleaved or normal bitplanes */ | 961 | static int amifb_ilbm = 0; /* interleaved or normal bitplanes */ |
962 | static int amifb_inverse = 0; | 962 | static int amifb_inverse = 0; |
963 | 963 | ||
964 | static u32 amifb_hfmin __initdata; /* monitor hfreq lower limit (Hz) */ | ||
965 | static u32 amifb_hfmax __initdata; /* monitor hfreq upper limit (Hz) */ | ||
966 | static u16 amifb_vfmin __initdata; /* monitor vfreq lower limit (Hz) */ | ||
967 | static u16 amifb_vfmax __initdata; /* monitor vfreq upper limit (Hz) */ | ||
968 | |||
964 | 969 | ||
965 | /* | 970 | /* |
966 | * Macros for the conversion from real world values to hardware register | 971 | * Macros for the conversion from real world values to hardware register |
@@ -2357,10 +2362,10 @@ static void __init amifb_setup_mcap(char *spec) | |||
2357 | if (hmax <= 0 || hmax <= hmin) | 2362 | if (hmax <= 0 || hmax <= hmin) |
2358 | return; | 2363 | return; |
2359 | 2364 | ||
2360 | fb_info.monspecs.vfmin = vmin; | 2365 | amifb_hfmin = hmin; |
2361 | fb_info.monspecs.vfmax = vmax; | 2366 | amifb_hfmax = hmax; |
2362 | fb_info.monspecs.hfmin = hmin; | 2367 | amifb_vfmin = vmin; |
2363 | fb_info.monspecs.hfmax = hmax; | 2368 | amifb_vfmax = vmax; |
2364 | } | 2369 | } |
2365 | 2370 | ||
2366 | static int __init amifb_setup(char *options) | 2371 | static int __init amifb_setup(char *options) |
@@ -3666,10 +3671,15 @@ default_chipset: | |||
3666 | } | 3671 | } |
3667 | } | 3672 | } |
3668 | 3673 | ||
3669 | /* | 3674 | if (amifb_hfmin) { |
3670 | * These monitor specs are for a typical Amiga monitor (e.g. A1960) | 3675 | fb_info.monspecs.hfmin = amifb_hfmin; |
3671 | */ | 3676 | fb_info.monspecs.hfmax = amifb_hfmax; |
3672 | if (fb_info.monspecs.hfmin == 0) { | 3677 | fb_info.monspecs.vfmin = amifb_vfmin; |
3678 | fb_info.monspecs.vfmax = amifb_vfmax; | ||
3679 | } else { | ||
3680 | /* | ||
3681 | * These are for a typical Amiga monitor (e.g. A1960) | ||
3682 | */ | ||
3673 | fb_info.monspecs.hfmin = 15000; | 3683 | fb_info.monspecs.hfmin = 15000; |
3674 | fb_info.monspecs.hfmax = 38000; | 3684 | fb_info.monspecs.hfmax = 38000; |
3675 | fb_info.monspecs.vfmin = 49; | 3685 | fb_info.monspecs.vfmin = 49; |