diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
| commit | 546db14ee74118296f425f3b91634fb767d67290 (patch) | |
| tree | 22b613a3da8d4bf663eec5e155af01b87fdf9094 /drivers/video/atyfb.c | |
| parent | 1e25e41c4f5474e14452094492dbc169b800e4c8 (diff) | |
Merge with Linux 2.3.23. The new bootmem stuff has broken various
platforms. At this time I've only verified that IP22 support compiles
and IP27 actually works.
Diffstat (limited to 'drivers/video/atyfb.c')
| -rw-r--r-- | drivers/video/atyfb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/atyfb.c b/drivers/video/atyfb.c index edba704a3..db21bfc6b 100644 --- a/drivers/video/atyfb.c +++ b/drivers/video/atyfb.c @@ -2192,7 +2192,7 @@ static int aty_dsp_gt(const struct fb_info_aty *info, u8 bpp, } dsp_precision -= 5; /* fifo_off<<6 */ - fifo_off = ((xclks_per_row*(fifo_size-1))>>5)+(1<<6); + fifo_off = ((xclks_per_row*(fifo_size-1))>>5)+(3<<6); if (info->total_vram > 1*1024*1024) { if (info->ram_type >= SDRAM) { @@ -2219,7 +2219,7 @@ static int aty_dsp_gt(const struct fb_info_aty *info, u8 bpp, if (xclks_per_row >= (page_size<<11)) fifo_on = ((2*page_size+1)<<6)+(xclks_per_row>>5); else - fifo_on = (3*page_size)<<6; + fifo_on = (3*page_size+2)<<6; dsp_xclks_per_row = xclks_per_row>>dsp_precision; dsp_on = fifo_on>>dsp_precision; |