Date: Tue, 2 Sep 2014 18:54:41 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270974 - in stable/10/sys: amd64/include dev/vt/hw/efifb Message-ID: <201409021854.s82IsffF098222@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Tue Sep 2 18:54:40 2014 New Revision: 270974 URL: http://svnweb.freebsd.org/changeset/base/270974 Log: MFC r263826: Update EFI framebuffer handoff from loader Sponsored by: The FreeBSD Foundation Modified: stable/10/sys/amd64/include/metadata.h stable/10/sys/dev/vt/hw/efifb/efifb.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/amd64/include/metadata.h ============================================================================== --- stable/10/sys/amd64/include/metadata.h Tue Sep 2 18:32:41 2014 (r270973) +++ stable/10/sys/amd64/include/metadata.h Tue Sep 2 18:54:40 2014 (r270974) @@ -33,11 +33,24 @@ #define MODINFOMD_SMAP_XATTR 0x1002 #define MODINFOMD_DTBP 0x1003 #define MODINFOMD_EFI_MAP 0x1004 +#define MODINFOMD_EFI_FB 0x1005 -struct efi_map_header { +struct efi_map_header { size_t memory_size; size_t descriptor_size; uint32_t descriptor_version; }; +struct efi_fb { + uint64_t fb_addr; + uint64_t fb_size; + int fb_height; + int fb_width; + int fb_stride; + uint32_t fb_mask_red; + uint32_t fb_mask_green; + uint32_t fb_mask_blue; + uint32_t fb_mask_reserved; +}; + #endif /* !_MACHINE_METADATA_H_ */ Modified: stable/10/sys/dev/vt/hw/efifb/efifb.c ============================================================================== --- stable/10/sys/dev/vt/hw/efifb/efifb.c Tue Sep 2 18:32:41 2014 (r270973) +++ stable/10/sys/dev/vt/hw/efifb/efifb.c Tue Sep 2 18:54:40 2014 (r270974) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_platform.h" -#include <machine/efi.h> #include <machine/metadata.h> #include <machine/vm.h> #include <machine/vmparam.h> @@ -107,8 +106,8 @@ vt_efifb_init(struct vt_device *vd) kmdp = preload_search_by_type("elf kernel"); if (kmdp == NULL) kmdp = preload_search_by_type("elf64 kernel"); - efifb = (struct efi_fb *)preload_search_info(kmdp, - MODINFO_METADATA | MODINFOMD_EFI_FB); + efifb = (struct efi_fb *)preload_search_info(kmdp, + MODINFO_METADATA | MODINFOMD_EFI_FB); if (efifb == NULL) return (CN_DEAD);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409021854.s82IsffF098222>