Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 661c65cd authored by Florian Tobias Schandinat's avatar Florian Tobias Schandinat
Browse files

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: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Joseph Chan <JosephChan@via.com.tw>
parent f4ab2f7a

drivers/video/via/hw.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/video/via/ioctl.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

	}