]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/rockchip: vop2: fix rk3588 dp+dsi maxclk verification
authorHeiko Stuebner <heiko.stuebner@cherry.de>
Fri, 15 Nov 2024 15:11:31 +0000 (16:11 +0100)
committerHeiko Stuebner <heiko@sntech.de>
Thu, 28 Nov 2024 21:07:18 +0000 (22:07 +0100)
The clock is in Hz while the value checked against is in kHz, so
actual frequencies will never be able to be below to max value.
Fix this by specifying the max-value in Hz too.

Fixes: 5a028e8f062f ("drm/rockchip: vop2: Add support for rk3588")
Signed-off-by: Heiko Stuebner <heiko.stuebner@cherry.de>
Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
Acked-by: Andy Yan <andyshrk@163.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Tested-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20241115151131.416830-1-heiko@sntech.de
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c

index 9ad025aa9ab0523c8807b331564c68da10c56c18..0c8ec7220fbe9cc35719ed0d4a86dfcda72e52c8 100644 (file)
@@ -1864,9 +1864,9 @@ static unsigned long rk3588_calc_cru_cfg(struct vop2_video_port *vp, int id,
                else
                        dclk_out_rate = v_pixclk >> 2;
 
-               dclk_rate = rk3588_calc_dclk(dclk_out_rate, 600000);
+               dclk_rate = rk3588_calc_dclk(dclk_out_rate, 600000000);
                if (!dclk_rate) {
-                       drm_err(vop2->drm, "DP dclk_out_rate out of range, dclk_out_rate: %ld KHZ\n",
+                       drm_err(vop2->drm, "DP dclk_out_rate out of range, dclk_out_rate: %ld Hz\n",
                                dclk_out_rate);
                        return 0;
                }
@@ -1881,9 +1881,9 @@ static unsigned long rk3588_calc_cru_cfg(struct vop2_video_port *vp, int id,
                 * dclk_rate = N * dclk_core_rate N = (1,2,4 ),
                 * we get a little factor here
                 */
-               dclk_rate = rk3588_calc_dclk(dclk_out_rate, 600000);
+               dclk_rate = rk3588_calc_dclk(dclk_out_rate, 600000000);
                if (!dclk_rate) {
-                       drm_err(vop2->drm, "MIPI dclk out of range, dclk_out_rate: %ld KHZ\n",
+                       drm_err(vop2->drm, "MIPI dclk out of range, dclk_out_rate: %ld Hz\n",
                                dclk_out_rate);
                        return 0;
                }