/** @file\r
\r
- Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>\r
+ Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
0, // HorizontalResolution\r
0, // VerticalResolution\r
PixelBltOnly, // PixelFormat\r
- 0, // PixelInformation\r
+ { 0 }, // PixelInformation\r
0, // PixelsPerScanLine\r
},\r
{\r
{\r
{\r
HARDWARE_DEVICE_PATH, HW_VENDOR_DP,\r
- (UINT8) (sizeof(VENDOR_DEVICE_PATH)),\r
- (UINT8) ((sizeof(VENDOR_DEVICE_PATH)) >> 8),\r
+ { (UINT8) (sizeof(VENDOR_DEVICE_PATH)), (UINT8) ((sizeof(VENDOR_DEVICE_PATH)) >> 8) },\r
},\r
// Hardware Device Path for Lcd\r
EFI_CALLER_ID_GUID // Use the driver's GUID\r
{\r
END_DEVICE_PATH_TYPE,\r
END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
- sizeof(EFI_DEVICE_PATH_PROTOCOL),\r
- 0\r
+ { sizeof(EFI_DEVICE_PATH_PROTOCOL), 0 }\r
}\r
},\r
(EFI_EVENT) NULL // ExitBootServicesEvent\r
// Setup all the relevant mode information\r
Instance->Gop.Mode->SizeOfInfo = sizeof(EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
Instance->Gop.Mode->FrameBufferBase = VramBaseAddress;\r
- Instance->Gop.Mode->FrameBufferSize = VramSize;\r
\r
// Set the flag before changing the mode, to avoid infinite loops\r
mDisplayInitialized = TRUE;\r
EFI_STATUS Status = EFI_SUCCESS;\r
LCD_INSTANCE* Instance;\r
\r
+ Status = LcdIdentify ();\r
+ if (EFI_ERROR(Status)) {\r
+ goto EXIT;\r
+ }\r
+\r
Status = LcdInstanceContructor (&Instance);\r
if (EFI_ERROR(Status)) {\r
goto EXIT;\r
}\r
\r
- // Install the Graphics Output Protocol and the Device Path\r
- Status = gBS->InstallMultipleProtocolInterfaces(\r
- &Instance->Handle,\r
- &gEfiGraphicsOutputProtocolGuid, &Instance->Gop,\r
- &gEfiDevicePathProtocolGuid, &Instance->DevicePath,\r
- NULL\r
- );\r
-\r
- if (EFI_ERROR(Status)) {\r
- DEBUG((DEBUG_ERROR, "GraphicsOutputDxeInitialize: Can not install the protocol. Exit Status=%r\n", Status));\r
- goto EXIT;\r
- }\r
-\r
- // Register for an ExitBootServicesEvent\r
- // When ExitBootServices starts, this function here will make sure that the graphics driver will shut down properly,\r
- // i.e. it will free up all allocated memory and perform any necessary hardware re-configuration.\r
- Status = gBS->CreateEvent (\r
- EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
- TPL_NOTIFY,\r
- LcdGraphicsExitBootServicesEvent, NULL,\r
- &Instance->ExitBootServicesEvent\r
- );\r
-\r
- if (EFI_ERROR(Status)) {\r
- DEBUG((DEBUG_ERROR, "GraphicsOutputDxeInitialize: Can not install the ExitBootServicesEvent handler. Exit Status=%r\n", Status));\r
- goto EXIT_ERROR_UNINSTALL_PROTOCOL;\r
- }\r
-\r
- // To get here, everything must be fine, so just exit\r
- goto EXIT;\r
+ // Install the Graphics Output Protocol and the Device Path\r
+ Status = gBS->InstallMultipleProtocolInterfaces(\r
+ &Instance->Handle,\r
+ &gEfiGraphicsOutputProtocolGuid, &Instance->Gop,\r
+ &gEfiDevicePathProtocolGuid, &Instance->DevicePath,\r
+ NULL\r
+ );\r
+\r
+ if (EFI_ERROR(Status)) {\r
+ DEBUG((DEBUG_ERROR, "GraphicsOutputDxeInitialize: Can not install the protocol. Exit Status=%r\n", Status));\r
+ goto EXIT;\r
+ }\r
+\r
+ // Register for an ExitBootServicesEvent\r
+ // When ExitBootServices starts, this function here will make sure that the graphics driver will shut down properly,\r
+ // i.e. it will free up all allocated memory and perform any necessary hardware re-configuration.\r
+ Status = gBS->CreateEvent (\r
+ EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+ TPL_NOTIFY,\r
+ LcdGraphicsExitBootServicesEvent, NULL,\r
+ &Instance->ExitBootServicesEvent\r
+ );\r
+\r
+ if (EFI_ERROR(Status)) {\r
+ DEBUG((DEBUG_ERROR, "GraphicsOutputDxeInitialize: Can not install the ExitBootServicesEvent handler. Exit Status=%r\n", Status));\r
+ goto EXIT_ERROR_UNINSTALL_PROTOCOL;\r
+ }\r
+\r
+ // To get here, everything must be fine, so just exit\r
+ goto EXIT;\r
\r
EXIT_ERROR_UNINSTALL_PROTOCOL:\r
- /* The following function could return an error message,\r
- * however, to get here something must have gone wrong already,\r
- * so preserve the original error, i.e. don't change\r
- * the Status variable, even it fails to uninstall the protocol.\r
- */\r
- gBS->UninstallMultipleProtocolInterfaces (\r
- Instance->Handle,\r
- &gEfiGraphicsOutputProtocolGuid, &Instance->Gop, // Uninstall Graphics Output protocol\r
- &gEfiDevicePathProtocolGuid, &Instance->DevicePath, // Uninstall device path\r
- NULL\r
- );\r
+ /* The following function could return an error message,\r
+ * however, to get here something must have gone wrong already,\r
+ * so preserve the original error, i.e. don't change\r
+ * the Status variable, even it fails to uninstall the protocol.\r
+ */\r
+ gBS->UninstallMultipleProtocolInterfaces (\r
+ Instance->Handle,\r
+ &gEfiGraphicsOutputProtocolGuid, &Instance->Gop, // Uninstall Graphics Output protocol\r
+ &gEfiDevicePathProtocolGuid, &Instance->DevicePath, // Uninstall device path\r
+ NULL\r
+ );\r
\r
EXIT:\r
- return Status;\r
+ return Status;\r
\r
}\r
\r
EFIAPI\r
LcdGraphicsQueryMode (\r
IN EFI_GRAPHICS_OUTPUT_PROTOCOL *This,\r
- IN UINT32 ModeNumber,\r
- OUT UINTN *SizeOfInfo,\r
- OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION **Info\r
- )\r
+ IN UINT32 ModeNumber,\r
+ OUT UINTN *SizeOfInfo,\r
+ OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION **Info\r
+ )\r
{\r
- EFI_STATUS Status = EFI_SUCCESS;\r
- LCD_INSTANCE *Instance;\r
+ EFI_STATUS Status = EFI_SUCCESS;\r
+ LCD_INSTANCE *Instance;\r
\r
- Instance = LCD_INSTANCE_FROM_GOP_THIS(This);\r
+ Instance = LCD_INSTANCE_FROM_GOP_THIS(This);\r
\r
// Setup the hardware if not already done\r
if( !mDisplayInitialized ) {\r
}\r
}\r
\r
- // Error checking\r
- if ( (This == NULL) || (Info == NULL) || (SizeOfInfo == NULL) || (ModeNumber >= This->Mode->MaxMode) ) {\r
- DEBUG((DEBUG_ERROR, "LcdGraphicsQueryMode: ERROR - For mode number %d : Invalid Parameter.\n", ModeNumber ));\r
- Status = EFI_INVALID_PARAMETER;\r
- goto EXIT;\r
- }\r
+ // Error checking\r
+ if ( (This == NULL) || (Info == NULL) || (SizeOfInfo == NULL) || (ModeNumber >= This->Mode->MaxMode) ) {\r
+ DEBUG((DEBUG_ERROR, "LcdGraphicsQueryMode: ERROR - For mode number %d : Invalid Parameter.\n", ModeNumber ));\r
+ Status = EFI_INVALID_PARAMETER;\r
+ goto EXIT;\r
+ }\r
\r
- *Info = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r
+ *Info = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r
if (*Info == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto EXIT;\r
}\r
\r
EXIT:\r
- return Status;\r
+ return Status;\r
}\r
\r
/***************************************\r
EFIAPI\r
LcdGraphicsSetMode (\r
IN EFI_GRAPHICS_OUTPUT_PROTOCOL *This,\r
- IN UINT32 ModeNumber\r
- )\r
+ IN UINT32 ModeNumber\r
+ )\r
{\r
- EFI_STATUS Status = EFI_SUCCESS;\r
- EFI_GRAPHICS_OUTPUT_BLT_PIXEL FillColour;\r
- LCD_INSTANCE* Instance;\r
+ EFI_STATUS Status = EFI_SUCCESS;\r
+ EFI_GRAPHICS_OUTPUT_BLT_PIXEL FillColour;\r
+ LCD_INSTANCE* Instance;\r
+ LCD_BPP Bpp;\r
\r
- Instance = LCD_INSTANCE_FROM_GOP_THIS (This);\r
+ Instance = LCD_INSTANCE_FROM_GOP_THIS (This);\r
\r
// Setup the hardware if not already done\r
if(!mDisplayInitialized) {\r
goto EXIT;\r
}\r
\r
- // Set the oscillator frequency to support the new mode\r
+ // Set the oscillator frequency to support the new mode\r
Status = LcdPlatformSetMode (ModeNumber);\r
if (EFI_ERROR(Status)) {\r
Status = EFI_DEVICE_ERROR;\r
goto EXIT;\r
}\r
\r
- // Update the UEFI mode information\r
- This->Mode->Mode = ModeNumber;\r
- LcdPlatformQueryMode (ModeNumber,&Instance->ModeInfo);\r
+ // Update the UEFI mode information\r
+ This->Mode->Mode = ModeNumber;\r
+ LcdPlatformQueryMode (ModeNumber,&Instance->ModeInfo);\r
+ Status = LcdPlatformGetBpp(ModeNumber, &Bpp);\r
+ if (EFI_ERROR(Status)) {\r
+ DEBUG ((DEBUG_ERROR, "LcdGraphicsSetMode: ERROR - Couldn't get bytes per pixel, status: %r\n", Status));\r
+ goto EXIT;\r
+ }\r
+ This->Mode->FrameBufferSize = Instance->ModeInfo.VerticalResolution\r
+ * Instance->ModeInfo.PixelsPerScanLine\r
+ * GetBytesPerPixel(Bpp);\r
\r
// Set the hardware to the new mode\r
- Status = LcdSetMode (ModeNumber);\r
+ Status = LcdSetMode (ModeNumber);\r
if (EFI_ERROR(Status)) {\r
Status = EFI_DEVICE_ERROR;\r
goto EXIT;\r
}\r
\r
- // The UEFI spec requires that we now clear the visible portions of the output display to black.\r
+ // The UEFI spec requires that we now clear the visible portions of the output display to black.\r
\r
// Set the fill colour to black\r
SetMem (&FillColour, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0x0);\r
0);\r
\r
EXIT:\r
- return Status;\r
+ return Status;\r
}\r
\r
UINTN\r
projects / mirror_edk2.git / blobdiff