[PATCH] atyfb: Fix CRTC_FIFO_LWM mask
authorVille Syrjälä <syrjala@sci.fi>
Tue, 10 Jan 2006 04:53:23 +0000 (20:53 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 16:01:48 +0000 (08:01 -0800)
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>
drivers/video/aty/atyfb_base.c

index 4c46706..5d46171 100644 (file)
@@ -1077,9 +1077,8 @@ static int aty_var_to_crtc(const struct fb_info *info,
 #endif /* CONFIG_FB_ATY_GENERIC_LCD */
 
        if (M64_HAS(MAGIC_FIFO)) {
-               /* Not VTB/GTB */
-               /* FIXME: magic FIFO values */
-               crtc->gen_cntl |= (aty_ld_le32(CRTC_GEN_CNTL, par) & CRTC2_PIX_WIDTH);
+               /* FIXME: display FIFO low watermark values */
+               crtc->gen_cntl |= (aty_ld_le32(CRTC_GEN_CNTL, par) & CRTC_FIFO_LWM);
        }
        crtc->dp_pix_width = dp_pix_width;
        crtc->dp_chain_mask = dp_chain_mask;