Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50c839c7 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Linus Torvalds
Browse files

[PATCH] atyfb: Fix CRTC_FIFO_LWM mask 



CRTC_FIFO_LWM was incorrectly masked.

Signed-off-by: default avatarVille Syrjälä <syrjala@sci.fi>
Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 866d84ce

drivers/video/aty/atyfb_base.c

+2 −3
Original line number Diff line number Diff line
@@ -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;