<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style></style> </head> <body lang="EN-US" link="blue" vlink="purple" style="word-wrap:break-word"> <div class="WordSection1"> I haven’t tried it, but farther down on the page steps 9 and 10 look like they’re related to the option Mike suggested, so they might be required for it to work?<o:p></o:p> <o:p> </o:p> <o:p> </o:p> <div> <div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in"> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sean Rhodes via groups.io Sent: Friday, December 16, 2022 1:58 AM To: devel@edk2.groups.io; michael.d.kinney@intel.com Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/Logo: Add a PCD to control the position of the Logo<o:p></o:p> </div> </div> <o:p> </o:p> <table class="MsoNormalTable" border="1" cellpadding="0" style="background:#FFEB9C"> <tbody> <tr> <td style="padding:.75pt .75pt .75pt .75pt"> External email: Use caution opening links or attachments <o:p></o:p> </td> </tr> </tbody> </table> <o:p> </o:p> <div> <div> <div> Hi Mike<o:p></o:p> </div> <div> <o:p> </o:p> </div> <div> Thanks; didn't work but I'll have a play wth it!<o:p></o:p> </div> <div> <o:p> </o:p> </div> <div> Sean<o:p></o:p> </div> </div> <o:p> </o:p> <div> <div> On Thu, 15 Dec 2022 at 22:55, Michael D Kinney <<a href="mailto:michael.d.kinney@intel.com">michael.d.kinney@intel.com</a>> wrote:<o:p></o:p> </div> <blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-right:0in"> <div> <div> <div> Hi Sean,<o:p></o:p> <o:p></o:p> Yes, that is the correct section. Hard to tell from patch email alone. <o:p></o:p> <o:p></o:p> There is a git config that can always include the name of the section of the INF/DEC/DSC/FDF file where a change is made.<o:p></o:p> Can make it a bit easier to review.<o:p></o:p> <o:p></o:p> <a href="https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt-git-guide-for-edk2-contributors-and-maintainers#contrib-05" target="_blank">https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt-git-guide-for-edk2-contributors-and-maintainers#contrib-05</a><o:p></o:p> <o:p></o:p> Specifically this one I think:<o:p></o:p> <o:p></o:p> git config diff.ini.xfuncname '^\[[A-Za-z0-9_., ]+]'<o:p></o:p> <o:p></o:p> Mike<o:p></o:p> <o:p></o:p> <div style="border:none;border-left:solid blue 1.5pt;padding:0in 0in 0in 4.0pt"> <div> <div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in"> From: Sean Rhodes <<a href="mailto:sean@starlabs.systems">sean@starlabs.systems</a>> Sent: Thursday, December 15, 2022 2:17 PM To: Kinney, Michael D <<a href="mailto:michael.d.kinney@intel.com" target="_blank">michael.d.kinney@intel.com</a>> Cc: <a href="mailto:devel@edk2.groups.io" target="_blank">devel@edk2.groups.io</a>; Gao, Zhichao <<a href="mailto:zhichao.gao@intel.com" target="_blank">zhichao.gao@intel.com</a>>; Ni, Ray <<a href="mailto:ray.ni@intel.com" target="_blank">ray.ni@intel.com</a>>; Wang, Jian J <<a href="mailto:jian.j.wang@intel.com" target="_blank">jian.j.wang@intel.com</a>>; Gao, Liming <<a href="mailto:gaoliming@byosoft.com.cn" target="_blank">gaoliming@byosoft.com.cn</a>> Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/Logo: Add a PCD to control the position of the Logo<o:p></o:p> </div> </div> <o:p></o:p> <div> <div> Hi Mike<o:p></o:p> </div> <div> <o:p></o:p> </div> <div> Thank you; changed to PcdGetBool.<o:p></o:p> </div> <div> <o:p></o:p> </div> <div> It's in `[PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]` - is that not right?<o:p></o:p> </div> <div> <o:p></o:p> </div> <div> Thanks<o:p></o:p> </div> <div> <o:p></o:p> </div> <div> Sean<o:p></o:p> </div> </div> <o:p></o:p> <div> <div> On Thu, 15 Dec 2022 at 22:09, Kinney, Michael D <<a href="mailto:michael.d.kinney@intel.com" target="_blank">michael.d.kinney@intel.com</a>> wrote:<o:p></o:p> </div> <blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-top:5.0pt;margin-right:0in;margin-bottom:5.0pt"> Hi Sean, A couple comments related to the PCD type below. Mike > -----Original Message----- > From: <a href="mailto:devel@edk2.groups.io" target="_blank">devel@edk2.groups.io</a> <<a href="mailto:devel@edk2.groups.io" target="_blank">devel@edk2.groups.io</a>> On Behalf Of Sean Rhodes > Sent: Thursday, December 15, 2022 1:12 PM > To: <a href="mailto:devel@edk2.groups.io" target="_blank">devel@edk2.groups.io</a> > Cc: Rhodes, Sean <<a href="mailto:sean@starlabs.systems" target="_blank">sean@starlabs.systems</a>>; Gao, Zhichao <<a href="mailto:zhichao.gao@intel.com" target="_blank">zhichao.gao@intel.com</a>>; Ni, Ray <<a href="mailto:ray.ni@intel.com" target="_blank">ray.ni@intel.com</a>>; Wang, Jian J > <<a href="mailto:jian.j.wang@intel.com" target="_blank">jian.j.wang@intel.com</a>>; Gao, Liming <<a href="mailto:gaoliming@byosoft.com.cn" target="_blank">gaoliming@byosoft.com.cn</a>> > Subject: [edk2-devel] [PATCH] MdeModulePkg/Logo: Add a PCD to control the position of the Logo > > When set to true, the Logo is positioned according to the BGRT > specification, 38.2% from the top of the screen. When set to false, > no behaviour is changed and the logo is positioned centrally. > > Cc: Zhichao Gao <<a href="mailto:zhichao.gao@intel.com" target="_blank">zhichao.gao@intel.com</a>> > Cc: Ray Ni <<a href="mailto:ray.ni@intel.com" target="_blank">ray.ni@intel.com</a>> > Cc: Jian J Wang <<a href="mailto:jian.j.wang@intel.com" target="_blank">jian.j.wang@intel.com</a>> > Cc: Liming Gao <<a href="mailto:gaoliming@byosoft.com.cn" target="_blank">gaoliming@byosoft.com.cn</a>> > Signed-off-by: Sean Rhodes <<a href="mailto:sean@starlabs.systems" target="_blank">sean@starlabs.systems</a>> > --- > MdeModulePkg/Logo/Logo.c | 28 +++++++++++++++++++++++++++- > MdeModulePkg/Logo/LogoDxe.inf | 4 ++++ > MdeModulePkg/MdeModulePkg.dec | 6 ++++++ > MdeModulePkg/MdeModulePkg.uni | 6 ++++++ > 4 files changed, 43 insertions(+), 1 deletion(-) > > diff --git a/MdeModulePkg/Logo/Logo.c b/MdeModulePkg/Logo/Logo.c > index 8ab874d2da..48862d3207 100644 > --- a/MdeModulePkg/Logo/Logo.c > +++ b/MdeModulePkg/Logo/Logo.c > @@ -13,6 +13,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #include <Protocol/HiiPackageList.h> > > #include <Library/UefiBootServicesTableLib.h> > > #include <Library/DebugLib.h> > > +#include <Library/PcdLib.h> > > > > typedef struct { > > EFI_IMAGE_ID ImageId; > > @@ -51,12 +52,14 @@ GetImage ( > IN EDKII_PLATFORM_LOGO_PROTOCOL *This, > > IN OUT UINT32 *Instance, > > OUT EFI_IMAGE_INPUT *Image, > > + EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput, > > OUT EDKII_PLATFORM_LOGO_DISPLAY_ATTRIBUTE *Attribute, > > OUT INTN *OffsetX, > > OUT INTN *OffsetY > > ) > > { > > - UINT32 Current; > > + UINT32 Current; > > + EFI_STATUS Status; > > > > if ((Instance == NULL) || (Image == NULL) || > > (Attribute == NULL) || (OffsetX == NULL) || (OffsetY == NULL)) > > @@ -69,6 +72,29 @@ GetImage ( > return EFI_NOT_FOUND; > > } > > > > + if (FixedPcdGetBool (PcdFollowMicrosoftRecommended)) { Should be PcdGetBool(). The only time FixedPcdGetxxx() is required is if the PCD value is being used to initialize a struct where the value is needed at build time. This allows the PCD type to be flexible and can be set in platform scope in the DSC file. > > + // > > + // Get current video resolution and text mode > > + // > > + Status = gBS->HandleProtocol ( > > + gST->ConsoleOutHandle, > > + &gEfiGraphicsOutputProtocolGuid, > > + (VOID **)&GraphicsOutput > > + ); > > + if (!EFI_ERROR (Status)) { > > + // > > + // Center of LOGO is in the vertical position 38.2% when PcdBootLogoOnlyEnable is TRUE > > + // Y = (VerticalResolution - LogoHeight) / 2 > > + // Y' = VerticalResolution * 0.382 - LogoHeight * 0.5 > > + // OffsetY + Y = Y' > > + // OffsetY = Y' - Y = -0.118 * VerticalResolution > > + // > > + *Attribute = EdkiiPlatformLogoDisplayAttributeCenter; > > + *OffsetX = 0; > > + *OffsetY = -118 * (INTN)GraphicsOutput->Mode->Info->VerticalResolution / 1000; > > + } > > + } > > + > > (*Instance)++; > > *Attribute = mLogos[Current].Attribute; > > *OffsetX = mLogos[Current].OffsetX; > > diff --git a/MdeModulePkg/Logo/LogoDxe.inf b/MdeModulePkg/Logo/LogoDxe.inf > index 41215d25d8..ce29950089 100644 > --- a/MdeModulePkg/Logo/LogoDxe.inf > +++ b/MdeModulePkg/Logo/LogoDxe.inf > @@ -41,6 +41,7 @@ > UefiBootServicesTableLib > > UefiDriverEntryPoint > > DebugLib > > + PcdLib > > > > [Protocols] > > gEfiHiiDatabaseProtocolGuid ## CONSUMES > > @@ -48,6 +49,9 @@ > gEfiHiiPackageListProtocolGuid ## PRODUCES CONSUMES > > gEdkiiPlatformLogoProtocolGuid ## PRODUCES > > > > +[Pcd] > > + gEfiMdeModulePkgTokenSpaceGuid.PcdFollowMicrosoftRecommended ## CONSUMES > > + > > [Depex] > > gEfiHiiDatabaseProtocolGuid AND > > gEfiHiiImageExProtocolGuid > > diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec > index be5e829ca9..c8bb51df3b 100644 > --- a/MdeModulePkg/MdeModulePkg.dec > +++ b/MdeModulePkg/MdeModulePkg.dec > @@ -2102,6 +2102,12 @@ > # @Prompt The shared bit mask when Intel Tdx is enabled. > > gEfiMdeModulePkgTokenSpaceGuid.PcdTdxSharedBitMask|0x0|UINT64|0x10000025 > > > > + ## This PCD sets the position of the Boot Logo. > > + # TRUE - The Logo is positioned following the recommendations from Microsoft. > > + # FALSE - The logo is positioned in the center of the screen. > > + # @ Prompt This position of the boot logo > > + gEfiMdeModulePkgTokenSpaceGuid.PcdFollowMicrosoftRecommended|FALSE|BOOLEAN|0x10000026 Which PCD section is this in? This PCD should support all PCD types so it can allow Fixed or Patchable or Dynmaic PCD types. > > + > > [PcdsPatchableInModule] > > ## Specify memory size with page number for PEI code when > > # Loading Module at Fixed Address feature is enabled. > > diff --git a/MdeModulePkg/MdeModulePkg.uni b/MdeModulePkg/MdeModulePkg.uni > index 33ce9f6198..09c1ac1cc1 100644 > --- a/MdeModulePkg/MdeModulePkg.uni > +++ b/MdeModulePkg/MdeModulePkg.uni > @@ -1338,3 +1338,9 @@ > #string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdPcieResizableBarSupport_HELP #language en-US "Indicates if the PCIe > Resizable BAR Capability Supported. \n" > > "TRUE - PCIe Resizable BAR > Capability is supported. \n" > > "FALSE - PCIe Resizable BAR > Capability is not supported. " > > + > > +#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdFollowMicrosoftRecommended_PROMPT #language en-US "The position of the Boot > Logo" > > + > > +#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdFollowMicrosoftRecommend_HELP #language en-US "Sets the position of the > Logo. When set to true, the Logo is positioned following the recommendations" > > + " from Microsoft, 38.2% from > the top of the screen." > > + > > -- > 2.37.2 > > > > -=-=-=-=-=-= > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#97479): <a href="https://edk2.groups.io/g/devel/message/97479" target="_blank"> https://edk2.groups.io/g/devel/message/97479</a> > Mute This Topic: <a href="https://groups.io/mt/95697776/1643496" target="_blank"> https://groups.io/mt/95697776/1643496</a> > Group Owner: <a href="mailto:devel%2Bowner@edk2.groups.io" target="_blank">devel+owner@edk2.groups.io</a> > Unsubscribe: <a href="https://edk2.groups.io/g/devel/unsub" target="_blank">https://edk2.groups.io/g/devel/unsub</a> [<a href="mailto:michael.d.kinney@intel.com" target="_blank">michael.d.kinney@intel.com</a>] > -=-=-=-=-=-= > <o:p></o:p> </blockquote> </div> </div> </div> </div> </div> </blockquote> </div> <div> </o:p> </div> </div> </div> </body> </html> <div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links: You receive all messages sent to this group. <a target="_blank" href="https://edk2.groups.io/g/devel/message/97510">View/Reply Online (#97510)</a> | | <a target="_blank" href="https://groups.io/mt/95697776/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a> <a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> | <a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> | <a href="https://edk2.groups.io/g/devel/unsub">Unsubscribe</a> [edk2-devel-archive@redhat.com] <div width="1" style="color:white;clear:both">_._,_._,_</div>