D7196.id18584.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7196.id18584.diff
View Options

	Index: head/sys/dev/fb/vesa.c
	===================================================================
	--- head/sys/dev/fb/vesa.c
	+++ head/sys/dev/fb/vesa.c
	@@ -134,6 +134,7 @@
	static vi_bitblt_t vesa_bitblt;
	static vi_diag_t vesa_diag;
	static int vesa_bios_info(int level);
	+static int vesa_late_load(int flags);

	static video_switch_t vesavidsw = {
	vesa_probe,
	@@ -1141,7 +1142,7 @@
	* initialization for now and try again later.
	*/
	if (adp == NULL) {
	- vga_sub_configure = vesa_configure;
	+ vga_sub_configure = vesa_late_load;
	return (ENODEV);
	}

	@@ -1909,6 +1910,17 @@
	static int
	vesa_load(void)
	{
	+
	+ return (vesa_late_load(0));
	+}
	+
	+/*
	+ * To be called from the vga_sub_configure hook in case the VGA adapter is
	+ * not found when VESA is loaded.
	+ */
	+static int
	+vesa_late_load(int flags)
	+{
	int error;

	if (vesa_init_done)
	@@ -1918,7 +1930,7 @@

	/* locate a VGA adapter */
	vesa_adp = NULL;
	- error = vesa_configure(0);
	+ error = vesa_configure(flags);

	if (error == 0)
	vesa_bios_info(bootverbose);