diff options
| author | Ville Syrjälä <syrjala@sci.fi> | 2006-01-09 23:53:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:01:48 -0500 |
| commit | 50c839c7b5e7d7cc3443176f5d5458e134b0b189 (patch) | |
| tree | 58c9f0f765b285782e80c752a8dd7c175f808b31 /drivers | |
| parent | 866d84cec0d37bd6a54428b66fed01e7b7aceeb3 (diff) | |
[PATCH] atyfb: Fix CRTC_FIFO_LWM mask
CRTC_FIFO_LWM was incorrectly masked.
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')
| -rw-r--r-- | drivers/video/aty/atyfb_base.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 4c46706188fe..5d46171fa64c 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
| @@ -1077,9 +1077,8 @@ static int aty_var_to_crtc(const struct fb_info *info, | |||
| 1077 | #endif /* CONFIG_FB_ATY_GENERIC_LCD */ | 1077 | #endif /* CONFIG_FB_ATY_GENERIC_LCD */ |
| 1078 | 1078 | ||
| 1079 | if (M64_HAS(MAGIC_FIFO)) { | 1079 | if (M64_HAS(MAGIC_FIFO)) { |
| 1080 | /* Not VTB/GTB */ | 1080 | /* FIXME: display FIFO low watermark values */ |
| 1081 | /* FIXME: magic FIFO values */ | 1081 | crtc->gen_cntl |= (aty_ld_le32(CRTC_GEN_CNTL, par) & CRTC_FIFO_LWM); |
| 1082 | crtc->gen_cntl |= (aty_ld_le32(CRTC_GEN_CNTL, par) & CRTC2_PIX_WIDTH); | ||
| 1083 | } | 1082 | } |
| 1084 | crtc->dp_pix_width = dp_pix_width; | 1083 | crtc->dp_pix_width = dp_pix_width; |
| 1085 | crtc->dp_chain_mask = dp_chain_mask; | 1084 | crtc->dp_chain_mask = dp_chain_mask; |