diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2024-01-08 09:42:07 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2024-01-08 09:42:07 +0100 |
| commit | 81c542d64c5020b272ad78132d2523f30b8e8ef4 (patch) | |
| tree | 3fddef1c3ec190b23754ebc0eb7f10bdb70f3699 /drivers | |
| parent | 90373f685811b00eb0be7b8e9520959defe82462 (diff) | |
| parent | 196da3f3f76a46905f7daab29c56974f1aba9a7a (diff) | |
Merge remote-tracking branch 'drm-misc/drm-misc-next-fixes' into drm-tip
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 574103fc79f9..85b3b4871a1d 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -35,7 +35,6 @@ #include "rockchip_drm_drv.h" #include "rockchip_drm_gem.h" -#include "rockchip_drm_fb.h" #include "rockchip_drm_vop2.h" #include "rockchip_rgb.h" @@ -1681,7 +1680,6 @@ static unsigned long rk3588_calc_cru_cfg(struct vop2_video_port *vp, int id, unsigned long dclk_core_rate = v_pixclk >> 2; unsigned long dclk_rate = v_pixclk; unsigned long dclk_out_rate; - unsigned long if_dclk_rate; unsigned long if_pixclk_rate; int K = 1; @@ -1696,8 +1694,8 @@ static unsigned long rk3588_calc_cru_cfg(struct vop2_video_port *vp, int id, } if_pixclk_rate = (dclk_core_rate << 1) / K; - if_dclk_rate = dclk_core_rate / K; /* + * if_dclk_rate = dclk_core_rate / K; * *if_pixclk_div = dclk_rate / if_pixclk_rate; * *if_dclk_div = dclk_rate / if_dclk_rate; */ |