Skip to content

Commit

Permalink
drm/sun4i: hdmi: Check for unset best_parent in sun4i_tmds_determine_…
Browse files Browse the repository at this point in the history
…rate

It is possible that if there is no exact rate match and
"rounded = clk_hw_round_rate(parent, ideal)" gives high enough values
(e.g. if rounded is 2 * ideal) that the condition
"abs(rate - rounded / i) < abs(rate - best_parent / best_div)" is never
met and best_parent is never set. This results in req->rate and
req->best_parent_rate being assigned 0.

To avoid this, we set best_parent to the first calculated rate if it is
unset. The sun4i_tmds_calc_divider function already has a similar check.

Fixes: 9c56810 ("drm/sun4i: Add HDMI support")
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180109020323.11852-2-net147@gmail.com
  • Loading branch information
Jonathan Liu authored and Maxime Ripard committed Jan 11, 2018
1 parent b0bb222 commit 111f4c3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ static int sun4i_tmds_determine_rate(struct clk_hw *hw,
goto out;
}

if (abs(rate - rounded / i) <
if (!best_parent || abs(rate - rounded / i) <
abs(rate - best_parent / best_div)) {
best_parent = rounded;
best_div = i;
Expand Down

0 comments on commit 111f4c3

Please sign in to comment.