From af61b37e29e1bf8ded5aeab5b0353511275053b2 Mon Sep 17 00:00:00 2001 From: Florian Tobias Schandinat Date: Sun, 22 May 2011 23:40:46 +0000 Subject: [PATCH] --- yaml --- r: 271334 b: refs/heads/master c: c174e3a3cd0594958c9afc6cdb8fbe20780d9c76 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/via/hw.c | 7 ------- trunk/drivers/video/via/via_modesetting.c | 4 ++++ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 10c85224c545..31630fe96ded 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f18e3e0ce0dacca497e3f1547095b3f9b111b0f7 +refs/heads/master: c174e3a3cd0594958c9afc6cdb8fbe20780d9c76 diff --git a/trunk/drivers/video/via/hw.c b/trunk/drivers/video/via/hw.c index 52d41f011d85..8b4bdf53b95e 100644 --- a/trunk/drivers/video/via/hw.c +++ b/trunk/drivers/video/via/hw.c @@ -1507,18 +1507,11 @@ void viafb_fill_crtc_timing(struct crt_mode_table *crt_table, crt_reg.ver_sync_end += crt_reg.ver_sync_start; h_addr = crt_reg.hor_addr; v_addr = crt_reg.ver_addr; - if (set_iga == IGA1) { - viafb_unlock_crt(); - viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7); - } - if (set_iga == IGA1) via_set_primary_timing(&crt_reg); else if (set_iga == IGA2) via_set_secondary_timing(&crt_reg); - viafb_lock_crt(); - viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7); viafb_load_fetch_count_reg(h_addr, bpp_byte, set_iga); /* load FIFO */ diff --git a/trunk/drivers/video/via/via_modesetting.c b/trunk/drivers/video/via/via_modesetting.c index 016d457b6681..0e431aee17bb 100644 --- a/trunk/drivers/video/via/via_modesetting.c +++ b/trunk/drivers/video/via/via_modesetting.c @@ -82,6 +82,10 @@ void via_set_primary_timing(const struct display_timing *timing) /* lock timing registers */ via_write_reg_mask(VIACR, 0x11, 0x80, 0x80); + + /* reset timing control */ + via_write_reg_mask(VIACR, 0x17, 0x00, 0x80); + via_write_reg_mask(VIACR, 0x17, 0x80, 0x80); } void via_set_secondary_timing(const struct display_timing *timing)