diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-12 15:52:34 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-12 15:52:34 +0300 |
| commit | cdbcd239e2e264dc3ef7bc7865bcb8ec0023876f (patch) | |
| tree | 94f5d2cf92ebb2eee640862cb2beaab6503bf846 /drivers/video/fbdev/tridentfb.c | |
| parent | 6e06780a98f149f131d46c1108d4ae27f05a9357 (diff) | |
| parent | 7e0abcd6b7ec1452bf4a850fccbae44043c05806 (diff) | |
| download | linux-cdbcd239e2e264dc3ef7bc7865bcb8ec0023876f.tar.xz | |
Merge branch 'x86/ras' into ras/core, to pick up changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/video/fbdev/tridentfb.c')
| -rw-r--r-- | drivers/video/fbdev/tridentfb.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/video/fbdev/tridentfb.c b/drivers/video/fbdev/tridentfb.c index 7ed9a227f5ea..01b43e9ce941 100644 --- a/drivers/video/fbdev/tridentfb.c +++ b/drivers/video/fbdev/tridentfb.c @@ -226,7 +226,7 @@ static void blade_image_blit(struct tridentfb_par *par, const char *data, writemmr(par, DST1, point(x, y)); writemmr(par, DST2, point(x + w - 1, y + h - 1)); - memcpy(par->io_virt + 0x10000, data, 4 * size); + iowrite32_rep(par->io_virt + 0x10000, data, size); } static void blade_copy_rect(struct tridentfb_par *par, @@ -673,8 +673,14 @@ static int get_nativex(struct tridentfb_par *par) static inline void set_lwidth(struct tridentfb_par *par, int width) { write3X4(par, VGA_CRTC_OFFSET, width & 0xFF); - write3X4(par, AddColReg, - (read3X4(par, AddColReg) & 0xCF) | ((width & 0x300) >> 4)); + /* chips older than TGUI9660 have only 1 width bit in AddColReg */ + /* touching the other one breaks I2C/DDC */ + if (par->chip_id == TGUI9440 || par->chip_id == CYBER9320) + write3X4(par, AddColReg, + (read3X4(par, AddColReg) & 0xEF) | ((width & 0x100) >> 4)); + else + write3X4(par, AddColReg, + (read3X4(par, AddColReg) & 0xCF) | ((width & 0x300) >> 4)); } /* For resolutions smaller than FP resolution stretch */ |