efi_loader: Fix warning in efi_gop

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

diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
index 33a3d7176710c22de010b10a658e81331f1a5587..e063e0c79b7e2f9f767eb47e44e8d5d867447c79 100644 (file)
--- a/lib/efi_loader/efi_gop.c
+++ b/lib/efi_loader/efi_gop.c
@@ -28,6 +28,7 @@ struct efi_gop_obj {
        struct efi_gop_mode mode;
        /* Fields we only have acces to during init */
        u32 bpix;
+       void *fb;
 };
 
 static efi_status_t EFIAPI gop_query_mode(struct efi_gop *this, u32 mode_number,
@@ -71,7 +72,7 @@ static efi_status_t EFIAPI gop_blt(struct efi_gop *this, void *buffer,
        if (operation != EFI_BLT_BUFFER_TO_VIDEO)
                return EFI_EXIT(EFI_INVALID_PARAMETER);
 
-       fb = (void*)gd->fb_base;
+       fb = gopobj->fb;
        line_len16 = gopobj->info.width * sizeof(u16);
        line_len32 = gopobj->info.width * sizeof(u32);
 
@@ -129,6 +130,8 @@ int efi_gop_register(void)
 {
        struct efi_gop_obj *gopobj;
        u32 bpix, col, row;
+       u64 fb_base, fb_size;
+       void *fb;
 
 #ifdef CONFIG_DM_VIDEO
        struct udevice *vdev;
@@ -141,11 +144,18 @@ int efi_gop_register(void)
        bpix = priv->bpix;
        col = video_get_xsize(vdev);
        row = video_get_ysize(vdev);
+       fb_base = (uintptr_t)priv->fb;
+       fb_size = priv->fb_size;
+       fb = priv->fb;
 #else
+       int line_len;
 
        bpix = panel_info.vl_bpix;
        col = panel_info.vl_col;
        row = panel_info.vl_row;
+       fb_base = gd->fb_base;
+       fb_size = lcd_get_size(&line_len);
+       fb = (void*)gd->fb_base;
 #endif
 
        switch (bpix) {
@@ -166,7 +176,7 @@ int efi_gop_register(void)
 
        /* Fill in object data */
        gopobj->parent.protocols[0].guid = &efi_gop_guid;
-       gopobj->parent.protocols[0].open = efi_return_handle;
+       gopobj->parent.protocols[0].protocol_interface = &gopobj->ops;
        gopobj->parent.handle = &gopobj->ops;
        gopobj->ops.query_mode = gop_query_mode;
        gopobj->ops.set_mode = gop_set_mode;
@@ -177,6 +187,16 @@ int efi_gop_register(void)
        gopobj->mode.info = &gopobj->info;
        gopobj->mode.info_size = sizeof(gopobj->info);
 
+#ifdef CONFIG_DM_VIDEO
+       if (bpix == VIDEO_BPP32) {
+#else
+       if (bpix == LCD_COLOR32) {
+#endif
+               /* With 32bit color space we can directly expose the fb */
+               gopobj->mode.fb_base = fb_base;
+               gopobj->mode.fb_size = fb_size;
+       }
+
        gopobj->info.version = 0;
        gopobj->info.width = col;
        gopobj->info.height = row;
@@ -184,6 +204,7 @@ int efi_gop_register(void)
        gopobj->info.pixels_per_scanline = col;
 
        gopobj->bpix = bpix;
+       gopobj->fb = fb;
 
        /* Hook up to the device list */
        list_add_tail(&gopobj->parent.link, &efi_obj_list);