#/** @file\r
#\r
-# Copyright (c) 2011-2017, ARM Limited. All rights reserved.\r
+# Copyright (c) 2011-2018, ARM Limited. All rights reserved.\r
# Copyright (c) 2015, Intel Corporation. All rights reserved.\r
#\r
# This program and the accompanying materials\r
gArmPlatformTokenSpaceGuid.PcdPL180SysMciRegAddress|0x00000000|UINT32|0x00000028\r
gArmPlatformTokenSpaceGuid.PcdPL180MciBaseAddress|0x00000000|UINT32|0x00000029\r
\r
+ # Graphics Output Pixel format\r
+ # 0 : PixelRedGreenBlueReserved8BitPerColor\r
+ # 1 : PixelBlueGreenRedReserved8BitPerColor\r
+ # 2 : PixelBitMask\r
+ # Default is set to UEFI console font format PixelBlueGreenRedReserved8BitPerColor\r
+ gArmPlatformTokenSpaceGuid.PcdGopPixelFormat|0x00000001|UINT32|0x00000040\r
+\r
[PcdsFixedAtBuild.common,PcdsDynamic.common]\r
## PL031 RealTimeClock\r
gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0|UINT32|0x00000024\r
\r
#include "HdLcd.h"\r
\r
-STATIC\r
-UINTN\r
-GetBytesPerPixel (\r
- IN LCD_BPP Bpp\r
- )\r
-{\r
- switch (Bpp) {\r
- case LCD_BITS_PER_PIXEL_24:\r
- return 4;\r
-\r
- case LCD_BITS_PER_PIXEL_16_565:\r
- case LCD_BITS_PER_PIXEL_16_555:\r
- case LCD_BITS_PER_PIXEL_12_444:\r
- return 2;\r
-\r
- case LCD_BITS_PER_PIXEL_8:\r
- case LCD_BITS_PER_PIXEL_4:\r
- case LCD_BITS_PER_PIXEL_2:\r
- case LCD_BITS_PER_PIXEL_1:\r
- return 1;\r
-\r
- default:\r
- return 0;\r
- }\r
-}\r
+#define BYTES_PER_PIXEL 4\r
\r
/** Initialize display.\r
\r
HDLCD_LITTLE_ENDIAN | HDLCD_4BYTES_PER_PIXEL\r
);\r
\r
- MmioWrite32 (HDLCD_REG_RED_SELECT, (0 << 16 | 8 << 8 | 0));\r
- MmioWrite32 (HDLCD_REG_GREEN_SELECT, (0 << 16 | 8 << 8 | 8));\r
- MmioWrite32 (HDLCD_REG_BLUE_SELECT, (0 << 16 | 8 << 8 | 16));\r
-\r
return EFI_SUCCESS;\r
}\r
\r
EFI_STATUS Status;\r
SCAN_TIMINGS *Horizontal;\r
SCAN_TIMINGS *Vertical;\r
- UINT32 BytesPerPixel;\r
- LCD_BPP LcdBpp;\r
+\r
+ EFI_GRAPHICS_OUTPUT_MODE_INFORMATION ModeInfo;\r
\r
// Set the video mode timings and other relevant information\r
Status = LcdPlatformGetTimings (\r
ASSERT (Horizontal != NULL);\r
ASSERT (Vertical != NULL);\r
\r
- Status = LcdPlatformGetBpp (ModeNumber, &LcdBpp);\r
+ // Get the pixel format information.\r
+ Status = LcdPlatformQueryMode (ModeNumber, &ModeInfo);\r
if (EFI_ERROR (Status)) {\r
ASSERT_EFI_ERROR (Status);\r
return Status;\r
}\r
\r
- BytesPerPixel = GetBytesPerPixel (LcdBpp);\r
+ if (ModeInfo.PixelFormat == PixelBlueGreenRedReserved8BitPerColor) {\r
+ MmioWrite32 (HDLCD_REG_RED_SELECT, (8 << 8) | 16);\r
+ MmioWrite32 (HDLCD_REG_BLUE_SELECT, (8 << 8) | 0);\r
+ } else {\r
+ MmioWrite32 (HDLCD_REG_BLUE_SELECT, (8 << 8) | 16);\r
+ MmioWrite32 (HDLCD_REG_RED_SELECT, (8 << 8) | 0);\r
+ }\r
+\r
+ MmioWrite32 (HDLCD_REG_GREEN_SELECT, (8 << 8) | 8);\r
\r
// Disable the controller\r
MmioWrite32 (HDLCD_REG_COMMAND, HDLCD_DISABLE);\r
// Update the frame buffer information with the new settings\r
MmioWrite32 (\r
HDLCD_REG_FB_LINE_LENGTH,\r
- Horizontal->Resolution * BytesPerPixel\r
+ Horizontal->Resolution * BYTES_PER_PIXEL\r
);\r
\r
- MmioWrite32 (HDLCD_REG_FB_LINE_PITCH, Horizontal->Resolution * BytesPerPixel);\r
+ MmioWrite32 (\r
+ HDLCD_REG_FB_LINE_PITCH,\r
+ Horizontal->Resolution * BYTES_PER_PIXEL\r
+ );\r
\r
MmioWrite32 (HDLCD_REG_FB_LINE_COUNT, Vertical->Resolution - 1);\r
\r
\r
@retval EFI_SUCCESS Display mode set successfuly.\r
@retval !(EFI_SUCCESS) Other errors.\r
-\r
**/\r
EFI_STATUS\r
LcdSetMode (\r
UINT32 LcdControl;\r
LCD_BPP LcdBpp;\r
\r
+ EFI_GRAPHICS_OUTPUT_MODE_INFORMATION ModeInfo;\r
+\r
// Set the video mode timings and other relevant information\r
Status = LcdPlatformGetTimings (\r
ModeNumber,\r
return Status;\r
}\r
\r
+ // Get the pixel format information\r
+ Status = LcdPlatformQueryMode (ModeNumber, &ModeInfo);\r
+ if (EFI_ERROR (Status)) {\r
+ ASSERT_EFI_ERROR (Status);\r
+ return Status;\r
+ }\r
+\r
// Disable the CLCD_LcdEn bit\r
MmioAnd32 (PL111_REG_LCD_CONTROL, ~PL111_CTRL_LCD_EN);\r
\r
\r
// PL111_REG_LCD_CONTROL\r
LcdControl = PL111_CTRL_LCD_EN | PL111_CTRL_LCD_BPP (LcdBpp) |\r
- PL111_CTRL_LCD_TFT | PL111_CTRL_LCD_PWR | PL111_CTRL_BGR;\r
+ PL111_CTRL_LCD_TFT | PL111_CTRL_LCD_PWR;\r
+ if (ModeInfo.PixelFormat == PixelBlueGreenRedReserved8BitPerColor) {\r
+ LcdControl |= PL111_CTRL_BGR;\r
+ }\r
MmioWrite32 (PL111_REG_LCD_CONTROL, LcdControl);\r
\r
return EFI_SUCCESS;\r