From 22f5e756850cd1311af16400ebb7085cf9265c2f Mon Sep 17 00:00:00 2001 From: Florian Tobias Schandinat Date: Tue, 10 Aug 2010 00:45:06 +0000 Subject: [PATCH] --- yaml --- r: 218749 b: refs/heads/master c: 661c65cd0ce180d5e3a3e05f08fc9e64cedcf91c h: refs/heads/master i: 218747: f018aa79eebd3c26df827caf0e17d7a4af77e714 v: v3 --- [refs] | 2 +- trunk/drivers/video/via/hw.c | 1 - trunk/drivers/video/via/ioctl.c | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e0476e120287..6da5031983e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4ab2f7a21338ae0f59ad925c23545e790cd51e3 +refs/heads/master: 661c65cd0ce180d5e3a3e05f08fc9e64cedcf91c diff --git a/trunk/drivers/video/via/hw.c b/trunk/drivers/video/via/hw.c index 4407943fa7d7..638cf96c8739 100644 --- a/trunk/drivers/video/via/hw.c +++ b/trunk/drivers/video/via/hw.c @@ -2313,7 +2313,6 @@ int viafb_setmode(struct VideoModeTable *vmode_tbl, int video_bpp, via_write_reg(VIASR, i, VPIT.SR[i - 1]); viafb_write_reg_mask(0x15, VIASR, 0xA2, 0xA2); - viafb_set_iga_path(); /* Write CRTC */ viafb_fill_crtc_timing(crt_timing, vmode_tbl, video_bpp / 8, IGA1); diff --git a/trunk/drivers/video/via/ioctl.c b/trunk/drivers/video/via/ioctl.c index 4d553d0b8d7a..ea1c51428823 100644 --- a/trunk/drivers/video/via/ioctl.c +++ b/trunk/drivers/video/via/ioctl.c @@ -94,6 +94,7 @@ int viafb_ioctl_hotplug(int hres, int vres, int bpp) viafb_CRT_ON = 0; viafb_LCD_ON = 0; viafb_DeviceStatus = DVI_Device; + viafb_set_iga_path(); return viafb_DeviceStatus; } status = 1; @@ -107,6 +108,7 @@ int viafb_ioctl_hotplug(int hres, int vres, int bpp) viafb_LCD_ON = 0; viafb_DeviceStatus = CRT_Device; + viafb_set_iga_path(); return viafb_DeviceStatus; }