From owner-svn-src-all@FreeBSD.ORG Tue Sep 2 18:54:41 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A32A03C4; Tue, 2 Sep 2014 18:54:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 744D11381; Tue, 2 Sep 2014 18:54:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s82Isfxh098224; Tue, 2 Sep 2014 18:54:41 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s82IsffF098222; Tue, 2 Sep 2014 18:54:41 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201409021854.s82IsffF098222@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 2 Sep 2014 18:54:41 +0000 (UTC) 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 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2014 18:54:41 -0000 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 #include #include #include @@ -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);