Merge tag 'efi-2020-04-rc4-5' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / lib / efi_loader / efi_gop.c

diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
index 2385c0f3b13852fd72f8a08939d7556102d93d91..1511e3bdb4220ce8a61be4ee4aa56b456ccad0f9 100644 (file)
--- a/lib/efi_loader/efi_gop.c
+++ b/lib/efi_loader/efi_gop.c
@@ -62,18 +62,6 @@ out:
        return EFI_EXIT(ret);
 }
 
-static efi_status_t EFIAPI gop_set_mode(struct efi_gop *this, u32 mode_number)
-{
-       efi_status_t ret = EFI_SUCCESS;
-
-       EFI_ENTRY("%p, %x", this, mode_number);
-
-       if (mode_number)
-               ret = EFI_UNSUPPORTED;
-
-       return EFI_EXIT(ret);
-}
-
 static __always_inline struct efi_gop_pixel efi_vid16_to_blt_col(u16 vid)
 {
        struct efi_gop_pixel blt = {
@@ -322,6 +310,44 @@ static efi_status_t gop_blt_vid_to_buf(struct efi_gop *this,
                           dx, dy, width, height, delta, vid_bpp);
 }
 
+/**
+ * gop_set_mode() - set graphical output mode
+ *
+ * This function implements the SetMode() service.
+ *
+ * See the Unified Extensible Firmware Interface (UEFI) specification for
+ * details.
+ *
+ * @this:              the graphical output protocol
+ * @mode_number:       the mode to be set
+ * Return:             status code
+ */
+static efi_status_t EFIAPI gop_set_mode(struct efi_gop *this, u32 mode_number)
+{
+       struct efi_gop_obj *gopobj;
+       struct efi_gop_pixel buffer = {0, 0, 0, 0};
+       efi_uintn_t vid_bpp;
+       efi_status_t ret = EFI_SUCCESS;
+
+       EFI_ENTRY("%p, %x", this, mode_number);
+
+       if (!this) {
+               ret = EFI_INVALID_PARAMETER;
+               goto out;
+       }
+       if (mode_number) {
+               ret = EFI_UNSUPPORTED;
+               goto out;
+       }
+       gopobj = container_of(this, struct efi_gop_obj, ops);
+       vid_bpp = gop_get_bpp(this);
+       ret = gop_blt_video_fill(this, &buffer, EFI_BLT_VIDEO_FILL, 0, 0, 0, 0,
+                                gopobj->info.width, gopobj->info.height, 0,
+                                vid_bpp);
+out:
+       return EFI_EXIT(ret);
+}
+
 /*
  * Copy rectangle.
  *
@@ -477,26 +503,26 @@ efi_status_t efi_gop_register(void)
        gopobj->mode.info = &gopobj->info;
        gopobj->mode.info_size = sizeof(gopobj->info);
 
+       gopobj->mode.fb_base = fb_base;
+       gopobj->mode.fb_size = fb_size;
+
+       gopobj->info.version = 0;
+       gopobj->info.width = col;
+       gopobj->info.height = row;
 #ifdef CONFIG_DM_VIDEO
        if (bpix == VIDEO_BPP32)
 #else
        if (bpix == LCD_COLOR32)
 #endif
        {
-               /*
-                * With 32bit color space we can directly expose the frame
-                * buffer
-                */
-               gopobj->mode.fb_base = fb_base;
-               gopobj->mode.fb_size = fb_size;
+               gopobj->info.pixel_format = EFI_GOT_BGRA8;
+       } else {
+               gopobj->info.pixel_format = EFI_GOT_BITMASK;
+               gopobj->info.pixel_bitmask[0] = 0xf800; /* red */
+               gopobj->info.pixel_bitmask[1] = 0x07e0; /* green */
+               gopobj->info.pixel_bitmask[2] = 0x001f; /* blue */
        }
-
-       gopobj->info.version = 0;
-       gopobj->info.width = col;
-       gopobj->info.height = row;
-       gopobj->info.pixel_format = EFI_GOT_BGRA8;
        gopobj->info.pixels_per_scanline = col;
-
        gopobj->bpix = bpix;
        gopobj->fb = fb;