D7290.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7290.diff
View Options

	Index: head/sys/dev/fb/vesa.c
	===================================================================
	--- head/sys/dev/fb/vesa.c
	+++ head/sys/dev/fb/vesa.c
	@@ -79,6 +79,7 @@
	typedef struct adp_state adp_state_t;

	static struct mtx vesa_lock;
	+MTX_SYSINIT(vesa_lock, &vesa_lock, "VESA lock", MTX_DEF);

	static int vesa_state;
	static void *vesa_state_buf;
	@@ -134,7 +135,6 @@
	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,
	@@ -1142,7 +1142,7 @@
	* initialization for now and try again later.
	*/
	if (adp == NULL) {
	- vga_sub_configure = vesa_late_load;
	+ vga_sub_configure = vesa_configure;
	return (ENODEV);
	}

	@@ -1910,27 +1910,14 @@
	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)
	return (0);

	- mtx_init(&vesa_lock, "VESA lock", NULL, MTX_DEF);
	-
	/* locate a VGA adapter */
	vesa_adp = NULL;
	- error = vesa_configure(flags);
	+ error = vesa_configure(0);

	if (error == 0)
	vesa_bios_info(bootverbose);
	@@ -1966,7 +1953,6 @@
	}

	vesa_bios_uninit();
	- mtx_destroy(&vesa_lock);

	return (error);
	}