[PATCH] video: Do not show splash and U-Boot logo simultaneously

[PATCH] video: Do not show splash and U-Boot logo simultaneously

[Fabio Estevam]

From: Fabio Estevam <festevam@denx.de>

Currently, on imx6sabresd and gwventana boards, the company logo
and U-Boot logo are shown.

The correct behavior is to show only the company logo, if available,
and not both logos.

Reported-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
 drivers/video/video-uclass.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 88797d4a21c2..42f9245ea8c5 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -407,7 +407,8 @@ static int video_post_probe(struct udevice *dev)
 		return ret;
 	}
 
-	if (IS_ENABLED(CONFIG_VIDEO_LOGO) && !plat->hide_logo) {
+	if (IS_ENABLED(CONFIG_VIDEO_LOGO) &&
+	    !IS_ENABLED(CONFIG_SPLASH_SCREEN) && !plat->hide_logo) {
 		ret = show_splash(dev);
 		if (ret) {
 			log_debug("Cannot show splash screen\n");
-- 
2.25.1

Re: [PATCH] video: Do not show splash and U-Boot logo simultaneously

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 751 bytes --]

On Mon, Mar 28, 2022 at 04:40:36PM -0300, Fabio Estevam wrote:

> From: Fabio Estevam <festevam@denx.de>
> 
> Currently, on imx6sabresd and gwventana boards, the company logo
> and U-Boot logo are shown.
> 
> The correct behavior is to show only the company logo, if available,
> and not both logos.
> 
> Reported-by: Tim Harvey <tharvey@gateworks.com>
> Signed-off-by: Fabio Estevam <festevam@denx.de>
> ---
>  drivers/video/video-uclass.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

This is probably good for the release, so I'll pick it up in a day or
two, to give time for testing and feedback.

But, why do we end up even having both logos in the binary?  That feels
like an odd regression itself.

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH] video: Do not show splash and U-Boot logo simultaneously

[Tim Harvey]

On Mon, Mar 28, 2022 at 12:40 PM Fabio Estevam <festevam@gmail.com> wrote:
>
> From: Fabio Estevam <festevam@denx.de>
>
> Currently, on imx6sabresd and gwventana boards, the company logo
> and U-Boot logo are shown.
>
> The correct behavior is to show only the company logo, if available,
> and not both logos.
>
> Reported-by: Tim Harvey <tharvey@gateworks.com>
> Signed-off-by: Fabio Estevam <festevam@denx.de>
> ---
>  drivers/video/video-uclass.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
> index 88797d4a21c2..42f9245ea8c5 100644
> --- a/drivers/video/video-uclass.c
> +++ b/drivers/video/video-uclass.c
> @@ -407,7 +407,8 @@ static int video_post_probe(struct udevice *dev)
>                 return ret;
>         }
>
> -       if (IS_ENABLED(CONFIG_VIDEO_LOGO) && !plat->hide_logo) {
> +       if (IS_ENABLED(CONFIG_VIDEO_LOGO) &&
> +           !IS_ENABLED(CONFIG_SPLASH_SCREEN) && !plat->hide_logo) {
>                 ret = show_splash(dev);
>                 if (ret) {
>                         log_debug("Cannot show splash screen\n");
> --
> 2.25.1
>

Fabio,

Thanks for confirming this issue on imx6sabresd and submitting this fix!

Tested-by: Tim Harvey <tharvey@gateworks.com> #gw_ventana

Best regards,

Tim

Re: [PATCH] video: Do not show splash and U-Boot logo simultaneously

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 525 bytes --]

On Mon, Mar 28, 2022 at 04:40:36PM -0300, Fabio Estevam wrote:

> From: Fabio Estevam <festevam@denx.de>
> 
> Currently, on imx6sabresd and gwventana boards, the company logo
> and U-Boot logo are shown.
> 
> The correct behavior is to show only the company logo, if available,
> and not both logos.
> 
> Reported-by: Tim Harvey <tharvey@gateworks.com>
> Signed-off-by: Fabio Estevam <festevam@denx.de>
> Tested-by: Tim Harvey <tharvey@gateworks.com> #gw_ventana

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]