[U-Boot] [PATCH 4/5] efi_loader: gop: fixes for CONFIG_DM_VIDEO without CONFIG_LCD

[Alexander Graf]

On 25.06.17 01:05, Rob Clark wrote:
> Signed-off-by: Rob Clark <robdclark at gmail.com>
> Cc: Alexander Graf <agraf at suse.de>

Looks reasonable to me, but could probably use a commit message ;). Also 
please make sure to CC Simon on all things DM.


Alex

> ---
>   cmd/bootefi.c            | 2 +-
>   lib/efi_loader/Makefile  | 1 +
>   lib/efi_loader/efi_gop.c | 7 ++++++-
>   3 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/cmd/bootefi.c b/cmd/bootefi.c
> index a6598df..4f11682 100644
> --- a/cmd/bootefi.c
> +++ b/cmd/bootefi.c
> @@ -280,7 +280,7 @@ static unsigned long do_bootefi_exec(void *efi, void *fdt)
>   #ifdef CONFIG_PARTITIONS
>   	efi_disk_register();
>   #endif
> -#ifdef CONFIG_LCD
> +#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
>   	efi_gop_register();
>   #endif
>   #ifdef CONFIG_NET
> diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
> index fa8b91a..3c230ac 100644
> --- a/lib/efi_loader/Makefile
> +++ b/lib/efi_loader/Makefile
> @@ -17,6 +17,7 @@ obj-$(CONFIG_CMD_BOOTEFI_HELLO) += helloworld_efi.o
>   obj-y += efi_image_loader.o efi_boottime.o efi_runtime.o efi_console.o
>   obj-y += efi_memory.o
>   obj-$(CONFIG_LCD) += efi_gop.o
> +obj-$(CONFIG_DM_VIDEO) += efi_gop.o
>   obj-$(CONFIG_PARTITIONS) += efi_disk.o
>   obj-$(CONFIG_NET) += efi_net.o
>   obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += efi_smbios.o
> diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
> index 286ad83..b8b0d5e 100644
> --- 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);
>   
> @@ -130,6 +131,7 @@ 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;
> @@ -144,6 +146,7 @@ int efi_gop_register(void)
>   	row = video_get_ysize(vdev);
>   	fb_base = (uintptr_t)priv->fb;
>   	fb_size = priv->fb_size;
> +	fb = priv->fb;
>   #else
>   	int line_len;
>   
> @@ -152,6 +155,7 @@ int efi_gop_register(void)
>   	row = panel_info.vl_row;
>   	fb_base = gd->fb_base;
>   	fb_size = lcd_get_size(&line_len);
> +	fb = gd->fb_base;
>   #endif
>   
>   	switch (bpix) {
> @@ -200,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);
>