| From 304ee410a5ec7209aa4994f1778148ddefe14206 Mon Sep 17 00:00:00 2001 |
| From: Neil Armstrong <narmstrong@baylibre.com> |
| Date: Wed, 28 Aug 2019 15:23:11 +0200 |
| Subject: [PATCH] drm/meson: vclk: use the correct G12A frac max value |
| |
| commit d56276a13c2b9ea287b9fc7cc78bed4c43b286f9 upstream. |
| |
| When calculating the HDMI PLL settings for a DMT mode PHY frequency, |
| use the correct max fractional PLL value for G12A VPU. |
| |
| With this fix, we can finally setup the 1024x768-60 mode. |
| |
| Fixes: 202b9808f8ed ("drm/meson: Add G12A Video Clock setup") |
| Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> |
| Reviewed-by: Kevin Hilman <khilman@baylibre.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20190828132311.23881-1-narmstrong@baylibre.com |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c |
| index 26732f038d19..48ad7cac7c0e 100644 |
| --- a/drivers/gpu/drm/meson/meson_vclk.c |
| +++ b/drivers/gpu/drm/meson/meson_vclk.c |
| @@ -635,13 +635,18 @@ static bool meson_hdmi_pll_validate_params(struct meson_drm *priv, |
| if (frac >= HDMI_FRAC_MAX_GXBB) |
| return false; |
| } else if (meson_vpu_is_compatible(priv, "amlogic,meson-gxm-vpu") || |
| - meson_vpu_is_compatible(priv, "amlogic,meson-gxl-vpu") || |
| - meson_vpu_is_compatible(priv, "amlogic,meson-g12a-vpu")) { |
| + meson_vpu_is_compatible(priv, "amlogic,meson-gxl-vpu")) { |
| /* Empiric supported min/max dividers */ |
| if (m < 106 || m > 247) |
| return false; |
| if (frac >= HDMI_FRAC_MAX_GXL) |
| return false; |
| + } else if (meson_vpu_is_compatible(priv, "amlogic,meson-g12a-vpu")) { |
| + /* Empiric supported min/max dividers */ |
| + if (m < 106 || m > 247) |
| + return false; |
| + if (frac >= HDMI_FRAC_MAX_G12A) |
| + return false; |
| } |
| |
| return true; |
| -- |
| 2.7.4 |
| |
