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

Commit ab482b58 authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Greg Kroah-Hartman
Browse files

drm/sun4i: hdmi ddc clk: Fix size of m divider 



[ Upstream commit 54e1e06bcf1cf6e7ac3f86daa5f7454add24b494 ]

m divider in DDC clock register is 4 bits wide. Fix that.

Fixes: 9c568101 ("drm/sun4i: Add HDMI support")
Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Reviewed-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200413095457.1176754-1-jernej.skrabec@siol.net


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c7c658ef

drivers/gpu/drm/sun4i/sun4i_hdmi.h

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ 
#define SUN4I_HDMI_DDC_CMD_IMPLICIT_WRITE	3



#define SUN4I_HDMI_DDC_CLK_REG		0x528

#define SUN4I_HDMI_DDC_CLK_M(m)			(((m) & 0x7) << 3)

#define SUN4I_HDMI_DDC_CLK_M(m)			(((m) & 0xf) << 3)

#define SUN4I_HDMI_DDC_CLK_N(n)			((n) & 0x7)



#define SUN4I_HDMI_DDC_LINE_CTRL_REG	0x540

drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static unsigned long sun4i_ddc_calc_divider(unsigned long rate, 
	unsigned long best_rate = 0;

	u8 best_m = 0, best_n = 0, _m, _n;



	for (_m = 0; _m < 8; _m++) {

	for (_m = 0; _m < 16; _m++) {

		for (_n = 0; _n < 8; _n++) {

			unsigned long tmp_rate;