Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a88cbbd4 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/sun4i: tcon: Change vertical total size computation inconsistency 



Both TCON channels need to have the resolution doubled, since the size the
hardware is going to use is whatever we put in the register divided by two.

However, we handle it differently for the two channels: in the channel 0,
our register access macro does the multiplication of the value passed as
paremeter, while in the channel 1, the macro doesn't do this, and we need
to do it before calling it.

Make this consistent by aligning the channel 0 with the channel 1
behaviour.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 3cb2f46b

drivers/gpu/drm/sun4i/sun4i_tcon.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ void sun4i_tcon0_mode_set(struct sun4i_tcon *tcon, 


	/* Set vertical display timings */

	regmap_write(tcon->regs, SUN4I_TCON0_BASIC2_REG,

		     SUN4I_TCON0_BASIC2_V_TOTAL(mode->crtc_vtotal) |

		     SUN4I_TCON0_BASIC2_V_TOTAL(mode->crtc_vtotal * 2) |

		     SUN4I_TCON0_BASIC2_V_BACKPORCH(bp));



	/* Set Hsync and Vsync length */

drivers/gpu/drm/sun4i/sun4i_tcon.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
#define SUN4I_TCON0_BASIC1_H_BACKPORCH(bp)		(((bp) - 1) & 0xfff)



#define SUN4I_TCON0_BASIC2_REG			0x50

#define SUN4I_TCON0_BASIC2_V_TOTAL(total)		((((total) * 2) & 0x1fff) << 16)

#define SUN4I_TCON0_BASIC2_V_TOTAL(total)		(((total) & 0x1fff) << 16)

#define SUN4I_TCON0_BASIC2_V_BACKPORCH(bp)		(((bp) - 1) & 0xfff)



#define SUN4I_TCON0_BASIC3_REG			0x54