Skip to content

Commit f37bb54

Browse files
chewittsuperna9999
authored andcommitted
Revert "drm/meson: vclk: fix calculation of 59.94 fractional rates"
This reverts commit bfbc68e. The patch does permit the offending YUV420 @ 59.94 phy_freq and vclk_freq mode to match in calculations. It also results in all fractional rates being unavailable for use. This was unintended and requires the patch to be reverted. Fixes: bfbc68e ("drm/meson: vclk: fix calculation of 59.94 fractional rates") Cc: stable@vger.kernel.org Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://lore.kernel.org/r/20250421201300.778955-2-martin.blumenstingl@googlemail.com Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://lore.kernel.org/r/20250421201300.778955-2-martin.blumenstingl@googlemail.com
1 parent 76c332d commit f37bb54

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/gpu/drm/meson/meson_vclk.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -790,13 +790,13 @@ meson_vclk_vic_supported_freq(struct meson_drm *priv, unsigned int phy_freq,
790790
FREQ_1000_1001(params[i].pixel_freq));
791791
DRM_DEBUG_DRIVER("i = %d phy_freq = %d alt = %d\n",
792792
i, params[i].phy_freq,
793-
FREQ_1000_1001(params[i].phy_freq/1000)*1000);
793+
FREQ_1000_1001(params[i].phy_freq/10)*10);
794794
/* Match strict frequency */
795795
if (phy_freq == params[i].phy_freq &&
796796
vclk_freq == params[i].vclk_freq)
797797
return MODE_OK;
798798
/* Match 1000/1001 variant */
799-
if (phy_freq == (FREQ_1000_1001(params[i].phy_freq/1000)*1000) &&
799+
if (phy_freq == (FREQ_1000_1001(params[i].phy_freq/10)*10) &&
800800
vclk_freq == FREQ_1000_1001(params[i].vclk_freq))
801801
return MODE_OK;
802802
}
@@ -1070,7 +1070,7 @@ void meson_vclk_setup(struct meson_drm *priv, unsigned int target,
10701070

10711071
for (freq = 0 ; params[freq].pixel_freq ; ++freq) {
10721072
if ((phy_freq == params[freq].phy_freq ||
1073-
phy_freq == FREQ_1000_1001(params[freq].phy_freq/1000)*1000) &&
1073+
phy_freq == FREQ_1000_1001(params[freq].phy_freq/10)*10) &&
10741074
(vclk_freq == params[freq].vclk_freq ||
10751075
vclk_freq == FREQ_1000_1001(params[freq].vclk_freq))) {
10761076
if (vclk_freq != params[freq].vclk_freq)

0 commit comments

Comments
 (0)