Re: [PATCH 09/21] drm/hisilicon/kirin: Fix 64bit divisions

2024-04-08 Thread John Stultz
On Mon, Apr 8, 2024 at 10:05 AM Ville Syrjala
 wrote:
>
> From: Ville Syrjälä 
>
> Use the appropriate 64bit division helpers to make the code
> build on 32bit architectures.
>
> Cc: Xinliang Liu 
> Cc: Tian Tao 
> Cc: Xinwei Kong 
> Cc: Sumit Semwal 
> Cc: Yongqin Liu 
> Cc: John Stultz 
> Signed-off-by: Ville Syrjälä 

Acked-by: John Stultz 


[PATCH 09/21] drm/hisilicon/kirin: Fix 64bit divisions

2024-04-08 Thread Ville Syrjala
From: Ville Syrjälä 

Use the appropriate 64bit division helpers to make the code
build on 32bit architectures.

Cc: Xinliang Liu 
Cc: Tian Tao 
Cc: Xinwei Kong 
Cc: Sumit Semwal 
Cc: Yongqin Liu 
Cc: John Stultz 
Signed-off-by: Ville Syrjälä 
---
 drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c 
b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c
index 566de4658719..a39cc549c20b 100644
--- a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c
+++ b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c
@@ -157,8 +157,8 @@ static u32 dsi_calc_phy_rate(u32 req_kHz, struct 
mipi_phy_params *phy)
q_pll = 0x10 >> (7 - phy->hstx_ckg_sel);
 
temp = f_kHz * (u64)q_pll * (u64)ref_clk_ps;
-   m_n_int = temp / (u64)10;
-   m_n = (temp % (u64)10) / (u64)1;
+   m_n_int = div64_u64_rem(temp, 10, );
+   m_n = div_u64(temp, 1);
 
if (m_n_int % 2 == 0) {
if (m_n * 6 >= 50) {
@@ -229,9 +229,8 @@ static u32 dsi_calc_phy_rate(u32 req_kHz, struct 
mipi_phy_params *phy)
phy->pll_fbd_div5f = 1;
}
 
-   f_kHz = (u64)10 * (u64)m_pll /
-   ((u64)ref_clk_ps * (u64)n_pll * (u64)q_pll);
-
+   f_kHz = div64_u64((u64)10 * (u64)m_pll,
+ (u64)ref_clk_ps * (u64)n_pll * (u64)q_pll);
if (f_kHz >= req_kHz)
break;
 
@@ -490,7 +489,7 @@ static void dsi_set_mode_timing(void __iomem *base,
hsa_time = (hsw * lane_byte_clk_kHz) / pixel_clk_kHz;
hbp_time = (hbp * lane_byte_clk_kHz) / pixel_clk_kHz;
tmp = (u64)htot * (u64)lane_byte_clk_kHz;
-   hline_time = DIV_ROUND_UP(tmp, pixel_clk_kHz);
+   hline_time = DIV_ROUND_UP_ULL(tmp, pixel_clk_kHz);
 
/* all specified in byte-lane clocks */
writel(hsa_time, base + VID_HSA_TIME);
-- 
2.43.2