Commit e4eb11b3 authored by Pengyu Luo's avatar Pengyu Luo Committed by Dmitry Baryshkov
Browse files

drm/msm/dsi: fix pclk rate calculation for bonded dsi 



Recently, we round up new_hdisplay once at most, for bonded dsi, we
may need twice, since they are independent links, we should round up
each half separately. This also aligns with the hdisplay we program
later in dsi_timing_setup()

Example:
	full_hdisplay = 1904, dsc_bpp = 8, bpc = 8
	new_full_hdisplay = DIV_ROUND_UP(1904 * 8, 8 * 3) = 635

if we use half display
	new_half_hdisplay = DIV_ROUND_UP(952 * 8, 8 * 3) = 318
	new_full_display = 636

Fixes: 7c9e4a55 ("drm/msm/dsi: Reduce pclk rate for compression")
Signed-off-by: default avatarPengyu Luo <mitltlatltl@gmail.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/709716/
Link: https://lore.kernel.org/r/20260306163255.215456-1-mitltlatltl@gmail.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
parent 4355b13d

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

+23 −6
Original line number Diff line number Diff line
@@ -584,13 +584,30 @@ void dsi_link_clk_disable_v2(struct msm_dsi_host *msm_host) 
 *  FIXME: Reconsider this if/when CMD mode handling is rewritten to use

 *  transfer time and data overhead as a starting point of the calculations.

 */

static unsigned long dsi_adjust_pclk_for_compression(const struct drm_display_mode *mode,

		const struct drm_dsc_config *dsc)

static unsigned long

dsi_adjust_pclk_for_compression(const struct drm_display_mode *mode,

				const struct drm_dsc_config *dsc,

				bool is_bonded_dsi)

{

	int new_hdisplay = DIV_ROUND_UP(mode->hdisplay * drm_dsc_get_bpp_int(dsc),

	int hdisplay, new_hdisplay, new_htotal;



	/*

	 * For bonded DSI, split hdisplay across two links and round up each

	 * half separately, passing the full hdisplay would only round up once.

	 * This also aligns with the hdisplay we program later in

	 * dsi_timing_setup()

	 */

	hdisplay = mode->hdisplay;

	if (is_bonded_dsi)

		hdisplay /= 2;



	new_hdisplay = DIV_ROUND_UP(hdisplay * drm_dsc_get_bpp_int(dsc),

				    dsc->bits_per_component * 3);



	int new_htotal = mode->htotal - mode->hdisplay + new_hdisplay;

	if (is_bonded_dsi)

		new_hdisplay *= 2;



	new_htotal = mode->htotal - mode->hdisplay + new_hdisplay;



	return mult_frac(mode->clock * 1000u, new_htotal, mode->htotal);

}
@@ -603,7 +620,7 @@ static unsigned long dsi_get_pclk_rate(const struct drm_display_mode *mode, 
	pclk_rate = mode->clock * 1000u;



	if (dsc)

		pclk_rate = dsi_adjust_pclk_for_compression(mode, dsc);

		pclk_rate = dsi_adjust_pclk_for_compression(mode, dsc, is_bonded_dsi);



	/*

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