d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r264997 and r265026. It is not required anymore.

Browse Source 
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Aleksandr Rybalko 2014-05-05 22:10:31 +00:00
parent 41603b8357
commit 5a0e08fb31
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/vt/hw/vga/vga.c
View File

@ -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;