Merge tag '5.5-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6

[linux-2.6-microblaze.git] / drivers / gpu / drm / meson / meson_vclk.c

diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c
index ac491a7..f690793 100644 (file)
--- a/drivers/gpu/drm/meson/meson_vclk.c
+++ b/drivers/gpu/drm/meson/meson_vclk.c
@@ -638,13 +638,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, VPU_COMPATIBLE_GXM) ||
-                  meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXL) ||
-                  meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) {
+                  meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXL)) {
                /* 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, VPU_COMPATIBLE_G12A)) {
+               /* Empiric supported min/max dividers */
+               if (m < 106 || m > 247)
+                       return false;
+               if (frac >= HDMI_FRAC_MAX_G12A)
+                       return false;
        }
 
        return true;