Author: emaste
Date: Thu Mar 27 19:43:38 2014
New Revision: 263826
URL: http://svnweb.freebsd.org/changeset/base/263826
Log:
Update EFI framebuffer handoff from loader
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/amd64/include/metadata.h
head/sys/dev/vt/hw/efifb/efifb.c
Modified: head/sys/amd64/include/metadata.h
==============================================================================
--- head/sys/amd64/include/metadata.h Thu Mar 27 19:16:28 2014
(r263825)
+++ head/sys/amd64/include/metadata.h Thu Mar 27 19:43:38 2014
(r263826)
@@ -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: head/sys/dev/vt/hw/efifb/efifb.c
==============================================================================
--- head/sys/dev/vt/hw/efifb/efifb.c Thu Mar 27 19:16:28 2014
(r263825)
+++ head/sys/dev/vt/hw/efifb/efifb.c Thu Mar 27 19:43:38 2014
(r263826)
@@ -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>
@@ -85,8 +84,8 @@ vt_efb_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);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
