diff options
| author | Ville Syrjälä <syrjala@sci.fi> | 2006-01-09 20:53:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 08:01:48 -0800 |
| commit | e98cef1e9e0ef0c5c02f6f3daa4da7956ad1c9ea (patch) | |
| tree | 8aa0f1d9ae9e6750fa7899af1bd902591e6e70b1 | |
| parent | a87d7fddbd7f46475842431d153d35bd03cf4f63 (diff) | |
| download | blackbird-op-linux-e98cef1e9e0ef0c5c02f6f3daa4da7956ad1c9ea.tar.gz blackbird-op-linux-e98cef1e9e0ef0c5c02f6f3daa4da7956ad1c9ea.zip | |
[PATCH] atyfb: Don't stretch with CRT
The overlay on 3D Rage LT Pro doesn't work correctly if stretching is
enabled when using only a CRT.
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>
| -rw-r--r-- | drivers/video/aty/atyfb_base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 845da14f56d3..ea3eebcb0236 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c @@ -982,7 +982,7 @@ static int aty_var_to_crtc(const struct fb_info *info, crtc->horz_stretching &= ~(HORZ_STRETCH_RATIO | HORZ_STRETCH_LOOP | AUTO_HORZ_RATIO | HORZ_STRETCH_MODE | HORZ_STRETCH_EN); - if (xres < par->lcd_width) { + if (xres < par->lcd_width && crtc->lcd_gen_cntl & LCD_ON) { do { /* * The horizontal blender misbehaves when HDisplay is less than a @@ -1044,7 +1044,7 @@ static int aty_var_to_crtc(const struct fb_info *info, } while (0); } - if (vdisplay < par->lcd_height) { + if (vdisplay < par->lcd_height && crtc->lcd_gen_cntl & LCD_ON) { crtc->vert_stretching = (VERT_STRETCH_USE0 | VERT_STRETCH_EN | (((vdisplay * (VERT_STRETCH_RATIO0 + 1)) / par->lcd_height) & VERT_STRETCH_RATIO0)); |
