Commit 527e4ca3 authored by Douglas Anderson's avatar Douglas Anderson Committed by Heiko Stuebner

drm/rockchip: Base adjustments of the mode based on prev adjustments

In vop_crtc_mode_fixup() we fixup the mode to show what we actually
will be able to achieve.  However we should base our adjustments on
any previous adjustments that were made.

As an example, the dw_hdmi driver may wish to make some small
adjustments to clock rates in its atomic_check() function.  If it
does, it will update the adjusted_mode.  We shouldn't throw away those
adjustments.

NOTE: the version of the dw_hdmi driver upstream doesn't _actually_
make such adjustments, but downstream in Chrome OS it does.  It is
plausible that one day we'll figure out how to cleanly make that
happen in an upstream-friendly way, so we should prepare by using the
right mode.
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20190614224730.98622-2-dianders@chromium.org
parent 99b9683f
...@@ -1013,8 +1013,8 @@ static bool vop_crtc_mode_fixup(struct drm_crtc *crtc, ...@@ -1013,8 +1013,8 @@ static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
struct vop *vop = to_vop(crtc); struct vop *vop = to_vop(crtc);
adjusted_mode->clock = adjusted_mode->clock =
DIV_ROUND_UP(clk_round_rate(vop->dclk, mode->clock * 1000), DIV_ROUND_UP(clk_round_rate(vop->dclk,
1000); adjusted_mode->clock * 1000), 1000);
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment