diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2010-08-10 02:45:06 +0200 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2010-09-24 04:14:48 +0200 |
| commit | 661c65cd0ce180d5e3a3e05f08fc9e64cedcf91c (patch) | |
| tree | b10a5d1ab088b643cab18c53655b81394ede485a /drivers/video/via | |
| parent | viafb: propagate __init and __devinit (diff) | |
| download | linux-661c65cd0ce180d5e3a3e05f08fc9e64cedcf91c.tar.xz linux-661c65cd0ce180d5e3a3e05f08fc9e64cedcf91c.zip | |
viafb: reduce viafb_set_iga_path usage
The result of viafb_set_iga_path can change after init only in the
hotplug ioctl. So we can move it there rather than doing it always
when a new mode is set. The setup during init is done via a call
from the init chip funtion.
This change enables a stable mapping between the old device scheme
and a new more powerfull one.
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Joseph Chan <JosephChan@via.com.tw>
Diffstat (limited to 'drivers/video/via')
| -rw-r--r-- | drivers/video/via/hw.c | 1 | ||||
| -rw-r--r-- | drivers/video/via/ioctl.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c index 4407943fa7d7..638cf96c8739 100644 --- a/drivers/video/via/hw.c +++ b/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/drivers/video/via/ioctl.c b/drivers/video/via/ioctl.c index 4d553d0b8d7a..ea1c51428823 100644 --- a/drivers/video/via/ioctl.c +++ b/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; } |