diff mbox

[U-Boot,RESEND] common/lcd_console: fix console/logo regression

Message ID 41ffd2998a013e7ef2255c811c24d9a4efa722e5.1438695858.git.marcel.ziswiler@toradex.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Marcel Ziswiler Aug. 4, 2015, 1:49 p.m. UTC 
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

The following commit changed the order of the column vs. row parameter
to the lcd_init_console() function but missed actually changing it as
well the second time it is called from lcd_clear() which resulted in a
garbled text console which this patch fixes.

commit 604c7d4a5a3cf70949f6e6094bf0d52ee3b4804d
common/lcd_console: introduce display/framebuffer rotation

Tested on Colibri T20 with my latest assortment of tegra
fixes/enhancements patch set.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
 common/lcd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Simon Glass Aug. 9, 2015, 3:07 p.m. UTC | #1 
On 4 August 2015 at 07:49, Marcel Ziswiler <marcel@ziswiler.com> wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
>
> The following commit changed the order of the column vs. row parameter
> to the lcd_init_console() function but missed actually changing it as
> well the second time it is called from lcd_clear() which resulted in a
> garbled text console which this patch fixes.
>
> commit 604c7d4a5a3cf70949f6e6094bf0d52ee3b4804d
> common/lcd_console: introduce display/framebuffer rotation
>
> Tested on Colibri T20 with my latest assortment of tegra
> fixes/enhancements patch set.
>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
>  common/lcd.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>
Marcel Ziswiler Aug. 13, 2015, 11:57 a.m. UTC | #2 
On Sun, 2015-08-09 at 09:07 -0600, Simon Glass wrote:

> Acked-by: Simon Glass <sjg@chromium.org>

Thanks, Simon.

Could any of you guys please pull that one in or how do we proceed?
Anatolij Gustschin Aug. 13, 2015, 12:10 p.m. UTC | #3 
Hi,

On Thu, 13 Aug 2015 13:57:37 +0200
Marcel Ziswiler <marcel@ziswiler.com> wrote:
...
> Could any of you guys please pull that one in or how do we proceed?

Sorry for delay, I'll merge the patch soon.

Thanks,

Anatolij
Tom Rini Aug. 13, 2015, 1:23 p.m. UTC | #4 
On Tue, Aug 04, 2015 at 03:49:50PM +0200, Marcel Ziswiler wrote:

> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> The following commit changed the order of the column vs. row parameter
> to the lcd_init_console() function but missed actually changing it as
> well the second time it is called from lcd_clear() which resulted in a
> garbled text console which this patch fixes.
> 
> commit 604c7d4a5a3cf70949f6e6094bf0d52ee3b4804d
> common/lcd_console: introduce display/framebuffer rotation
> 
> Tested on Colibri T20 with my latest assortment of tegra
> fixes/enhancements patch set.
> 
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/common/lcd.c b/common/lcd.c
index 5a52fe4..d29308a 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -234,8 +234,8 @@  void lcd_clear(void)
 	lcd_logo();
 #if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
 	addr = (ulong)lcd_base + BMP_LOGO_HEIGHT * lcd_line_length;
-	lcd_init_console((void *)addr, panel_info.vl_row,
-			 panel_info.vl_col, panel_info.vl_rot);
+	lcd_init_console((void *)addr, panel_info.vl_col,
+			 panel_info.vl_row, panel_info.vl_rot);
 #endif
 	lcd_sync();
 }