The fbcon module takes care of displaying the logo, if any. Remove
the code form mmpfb. If we want to display the logo without fbcon,
we should implement this in the fbdev core code.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/video/fbdev/mmp/fb/mmpfb.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/video/fbdev/mmp/fb/mmpfb.c b/drivers/video/fbdev/mmp/fb/mmpfb.c
index 42a87474bcea..2d9797c6fb3e 100644
--- a/drivers/video/fbdev/mmp/fb/mmpfb.c
+++ b/drivers/video/fbdev/mmp/fb/mmpfb.c
@@ -628,13 +628,6 @@ static int mmpfb_probe(struct platform_device *pdev)
 	dev_info(fbi->dev, "loaded to /dev/fb%d <%s>.\n",
 		info->node, info->fix.id);
 
-#ifdef CONFIG_LOGO
-	if (fbi->fb_start) {
-		fb_prepare_logo(info, 0);
-		fb_show_logo(info, 0);
-	}
-#endif
-
 	return 0;
 
 failed_clear_info:
-- 
2.41.0

Thomas Zimmermann <tzimmermann@suse.de> writes:

> The fbcon module takes care of displaying the logo, if any. Remove
> the code form mmpfb. If we want to display the logo without fbcon,

s/form/from

> we should implement this in the fbdev core code.
>

The commit message says the same than patch #1 but the driver will behave
differently right? That is, won't only show the logo when fbcon is not
enabled but unconditionally? So the logo will be duplicated when fbcon is
enabled?

If I understood that correctly, probably you should mention that in the
commit message since removing the fb_show_logo() will make the driver to
behave correctly.

> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---

Acked-by: Javier Martinez Canillas <javierm@redhat.com>

-- 
Best regards,

Javier Martinez Canillas
Core Platforms
Red Hat

Hi Javier

Am 06.09.23 um 11:54 schrieb Javier Martinez Canillas:
> Thomas Zimmermann <tzimmermann@suse.de> writes:
> 
>> The fbcon module takes care of displaying the logo, if any. Remove
>> the code form mmpfb. If we want to display the logo without fbcon,
> 
> s/form/from
> 
>> we should implement this in the fbdev core code.
>>
> 
> The commit message says the same than patch #1 but the driver will behave
> differently right? That is, won't only show the logo when fbcon is not
> enabled but unconditionally? So the logo will be duplicated when fbcon is
> enabled?
> 
> If I understood that correctly, probably you should mention that in the
> commit message since removing the fb_show_logo() will make the driver to
> behave correctly.

TBH I don't understand what happens here if the console and the logo has 
been enabled at the same time. AFAIK fbcon respects display rotation, 
but this driver doesn't. So the logo shows up in the wrong place then?

> 
>> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
>> ---
> 
> Acked-by: Javier Martinez Canillas <javierm@redhat.com>
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)