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

Commit 49e08e1d authored by Jonathan Marek's avatar Jonathan Marek Committed by Greg Kroah-Hartman
Browse files

drm/msm/dsi: fix 32-bit signed integer extension in pclk_rate calculation 



[ Upstream commit 358b762400bd94db2a14a72dfcef74c7da6bd845 ]

When (mode->clock * 1000) is larger than (1<<31), int to unsigned long
conversion will sign extend the int to 64 bits and the pclk_rate value
will be incorrect.

Fix this by making the result of the multiplication unsigned.

Note that above (1<<32) would still be broken and require more changes, but
its unlikely anyone will need that anytime soon.

Fixes: c4d8cfe5 ("drm/msm/dsi: add implementation for helper functions")
Signed-off-by: default avatarJonathan Marek <jonathan@marek.ca>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/618434/
Link: https://lore.kernel.org/r/20241007050157.26855-2-jonathan@marek.ca


Signed-off-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8fb8f613

drivers/gpu/drm/msm/dsi/dsi_host.c

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ static u32 dsi_get_pclk_rate(struct msm_dsi_host *msm_host, bool is_dual_dsi) 
	struct drm_display_mode *mode = msm_host->mode;

	u32 pclk_rate;



	pclk_rate = mode->clock * 1000;

	pclk_rate = mode->clock * 1000u;



	/*

	 * For dual DSI mode, the current DRM mode has the complete width of the