diff options
author | Ville Syrjälä <syrjala@sci.fi> | 2006-01-09 23:53:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:01:48 -0500 |
commit | a87d7fddbd7f46475842431d153d35bd03cf4f63 (patch) | |
tree | ea069c0462c3a247038d9186110bab2db03fc5fe /drivers/video | |
parent | 50c839c7b5e7d7cc3443176f5d5458e134b0b189 (diff) |
[PATCH] atyfb: Fix interlaced modes
Fix interlaced display modes.
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>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 5d46171fa64c..845da14f56d3 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -967,16 +967,6 @@ static int aty_var_to_crtc(const struct fb_info *info, | |||
967 | vdisplay = yres; | 967 | vdisplay = yres; |
968 | if(vmode & FB_VMODE_DOUBLE) | 968 | if(vmode & FB_VMODE_DOUBLE) |
969 | vdisplay <<= 1; | 969 | vdisplay <<= 1; |
970 | if(vmode & FB_VMODE_INTERLACED) { | ||
971 | vdisplay >>= 1; | ||
972 | |||
973 | /* The prefered mode for the LCD is not interlaced, so disable it if | ||
974 | it was enabled. For doublescan there is no problem, because we can | ||
975 | compensate for it in the hardware stretching (we stretch half as much) | ||
976 | */ | ||
977 | vmode &= ~FB_VMODE_INTERLACED; | ||
978 | /*crtc->gen_cntl &= ~CRTC_INTERLACE_EN;*/ | ||
979 | } | ||
980 | crtc->gen_cntl &= ~(CRTC2_EN | CRTC2_PIX_WIDTH); | 970 | crtc->gen_cntl &= ~(CRTC2_EN | CRTC2_PIX_WIDTH); |
981 | crtc->lcd_gen_cntl &= ~(HORZ_DIVBY2_EN | DIS_HOR_CRT_DIVBY2 | | 971 | crtc->lcd_gen_cntl &= ~(HORZ_DIVBY2_EN | DIS_HOR_CRT_DIVBY2 | |
982 | /*TVCLK_PM_EN | VCLK_DAC_PM_EN |*/ | 972 | /*TVCLK_PM_EN | VCLK_DAC_PM_EN |*/ |