Date: Mon, 5 May 2014 22:10:31 +0000 (UTC) From: Aleksandr Rybalko <ray@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r265402 - head/sys/dev/vt/hw/vga Message-ID: <201405052210.s45MAVfj095811@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ray Date: Mon May 5 22:10:31 2014 New Revision: 265402 URL: http://svnweb.freebsd.org/changeset/base/265402 Log: Revert r264997 and r265026. It is not required anymore. Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/vt/hw/vga/vga.c Modified: head/sys/dev/vt/hw/vga/vga.c ============================================================================== --- head/sys/dev/vt/hw/vga/vga.c Mon May 5 22:03:08 2014 (r265401) +++ head/sys/dev/vt/hw/vga/vga.c Mon May 5 22:10:31 2014 (r265402) @@ -45,10 +45,8 @@ __FBSDID("$FreeBSD$"); #if defined(__amd64__) || defined(__i386__) #include <vm/vm.h> #include <vm/pmap.h> -#include <machine/metadata.h> #include <machine/pmap.h> #include <machine/vmparam.h> -#include <sys/linker.h> #endif /* __amd64__ || __i386__ */ struct vga_softc { @@ -638,19 +636,6 @@ vga_init(struct vt_device *vd) struct vga_softc *sc = vd->vd_softc; int textmode = 0; -#if defined(__amd64__) - /* Disable if EFI framebuffer present. Should be handled by priority - * logic in vt(9), but this will do for now. XXX */ - - caddr_t kmdp, efifb; - kmdp = preload_search_by_type("elf kernel"); - if (kmdp == NULL) - kmdp = preload_search_by_type("elf64 kernel"); - efifb = preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_EFI_FB); - if (efifb != NULL) - return (CN_DEAD); -#endif - #if defined(__amd64__) || defined(__i386__) sc->vga_fb_tag = X86_BUS_SPACE_MEM; sc->vga_fb_handle = KERNBASE + VGA_MEM_BASE;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405052210.s45MAVfj095811>