drm/meson: vclk: revert and re-fix vclk calculations
Subsystems (5)
cover drm/meson: vclk: revert and re-fix vclk calculations
Patch 1 reverts a previous fix for loss of HDMI sync when playing YUV420 @ 59.94 media. The patch does resolve a calculation issue. It also makes all fractional rates invalid which is a bigger problem.
Patch 2 provides a proper fix after I figured out the actual root cause of the original problem. This time the maths checks out.
Apologies to the stable team as the original patch has been applied to a wide range of older and LTS kernels (as far as 5.10). Please let me know if combining the two patches into a single 'fix the previous fix' patch would be preferred?
Christian
Christian Hewitt (2):
Revert "drm/meson: vclk: fix calculation of 59.94 fractional rates" drm/meson: vclk: fix precision in vclk calculations
drivers/gpu/drm/meson/meson_encoder_hdmi.c | 42 +++++++++++----------- drivers/gpu/drm/meson/meson_vclk.c | 7 ++-- 2 files changed, 25 insertions(+), 24 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/2 Revert "drm/meson: vclk: fix calculation of 59.94 fractional rates"
This reverts commit bfbc68e4d8695497f858a45a142665e22a512ea3.
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.
--- drivers/gpu/drm/meson/meson_vclk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/meson/meson_vclk.c +3 -3
@@ -790,13 +790,13 @@ meson_vclk_vic_supported_freq(struct meson_drm *priv, unsigned int phy_freq, FREQ_1000_1001(params[i].pixel_freq));DRM_DEBUG_DRIVER ("i = %d phy_freq = %d alt = %d\n" , i, params[i].phy_freq, -FREQ_1000_1001 (params[i].phy_freq/1000 )*1000 ); +FREQ_1000_1001 (params[i].phy_freq/10 )*10 );/* Match strict frequency */ if (phy_freq == params[i].phy_freq && vclk_freq == params[i].vclk_freq)return MODE_OK ;/* Match 1000/1001 variant */ -if (phy_freq == (FREQ_1000_1001 (params[i].phy_freq/1000 )*1000 ) && +if (phy_freq == (FREQ_1000_1001 (params[i].phy_freq/10 )*10 ) && vclk_freq ==FREQ_1000_1001 (params[i].vclk_freq))return MODE_OK ; }
@@ -1070,7 +1070,7 @@ void meson_vclk_setup(struct meson_drm *priv, unsigned int target,for (freq =0 ; params[freq].pixel_freq ; ++freq) {if ((phy_freq == params[freq].phy_freq || - phy_freq ==FREQ_1000_1001 (params[freq].phy_freq/1000 )*1000 ) && + phy_freq ==FREQ_1000_1001 (params[freq].phy_freq/10 )*10 ) && (vclk_freq == params[freq].vclk_freq || vclk_freq ==FREQ_1000_1001 (params[freq].vclk_freq))) {if (vclk_freq != params[freq].vclk_freq)
Signature · 1 line
2.34.1
Neil Armstrong
maintainerRe: [PATCH 1/2] Revert "drm/meson: vclk: fix calculation of 59.94 fractional rates"
Quoted 34 lines · Christian Hewitt
This reverts commit
bfbc68e4d8695497f858a45a142665e22a512ea3.The patch does permit the offending YUV420 @ 59.94
phy_freqandvclk_freqmode 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.Cc <[email protected]>Signed-off-by Christian Hewitt <[email protected]>--- drivers/gpu/drm/meson/meson_vclk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/meson/meson_vclk.c +2
-2@@ -790,13 +790,13 @@ meson_vclk_vic_supported_freq(struct meson_drm *priv, unsigned int phy_freq, FREQ_1000_1001(params[i].pixel_freq));DRM_DEBUG_DRIVER ("i = %d phy_freq = %d alt = %d\n" , i, params[i].phy_freq, -FREQ_1000_1001 (params[i].phy_freq/1000 )*1000 ); +FREQ_1000_1001 (params[i].phy_freq/10 )*10 );/* Match strict frequency */ if (phy_freq == params[i].phy_freq && vclk_freq == params[i].vclk_freq)return MODE_OK ;/* Match 1000/1001 variant */ -if (phy_freq == (FREQ_1000_1001 (params[i].phy_freq/1000 )*1000 ) && +if (phy_freq == (FREQ_1000_1001 (params[i].phy_freq/10 )*10 ) && vclk_freq ==FREQ_1000_1001 (params[i].vclk_freq))return MODE_OK ; }
drivers/gpu/drm/meson/meson_vclk.c void meson_vclk_setup(struct meson_drm *priv, unsigned int target, · line 1076
Quoted 8 lines
drivers/gpu/drm/meson/meson_vclk.c +1
-1@@ -1070,7 +1070,7 @@ void meson_vclk_setup(struct meson_drm *priv, unsigned int target,for (freq =0 ; params[freq].pixel_freq ; ++freq) {if ((phy_freq == params[freq].phy_freq || - phy_freq ==FREQ_1000_1001 (params[freq].phy_freq/1000 )*1000 ) && + phy_freq ==FREQ_1000_1001 (params[freq].phy_freq/10 )*10 ) && (vclk_freq == params[freq].vclk_freq || vclk_freq ==FREQ_1000_1001 (params[freq].vclk_freq))) {if (vclk_freq != params[freq].vclk_freq)
I wonder if a Fixes is also required here
PATCH 2/2 drm/meson: vclk: fix precision in vclk calculations
In reply to Christian HewittPlaying YUV420 @ 59.94 media causes HDMI output to lose sync with a fatal error reported:
[ 89.610280] Fatal Error, invalid HDMI vclk freq 593406
In meson_encoder_hdmi_set_vclk the initial vclk_freq value is 593407 but YUV420 modes halve the value to 296703.5 and this is stored as int which loses precision by rounding down to 296703. The rounded value is later doubled to 593406 and then meson_encoder_hdmi_set_vclk sets an invalid vclk_freq value and the error triggers during meson_vlkc_setup validation.
Fix precision in meson_encoder_hdmi_set_vclk by switching to unsigned long long KHz values instead of int MHz. As values for phy_freq are now more accurate we also need to handle an additional match scenario in meson_vclk_setup.
--- drivers/gpu/drm/meson/meson_encoder_hdmi.c | 42 +++++++++++----------- drivers/gpu/drm/meson/meson_vclk.c | 3 +- 2 files changed, 23 insertions(+), 22 deletions(-)
drivers/gpu/drm/meson/meson_encoder_hdmi.c +21 -21
@@ -70,12 +70,12 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, {struct meson_drm *priv = encoder_hdmi->priv;int vic =drm_match_cea_mode (mode); -unsigned int phy_freq; -unsigned int vclk_freq; -unsigned int venc_freq; -unsigned int hdmi_freq; +unsigned long long vclk_freq; +unsigned long long phy_freq; +unsigned long long venc_freq; +unsigned long long hdmi_freq; - vclk_freq = mode->clock; + vclk_freq = mode->clock *1000ULL ;/* For 420, pixel clock is half unlike venc clock */ if (encoder_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_UYYVYY8_0_5X24 )
@@ -85,8 +85,9 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, phy_freq = vclk_freq *10 ;if (!vic) { -meson_vclk_setup (priv,MESON_VCLK_TARGET_DMT , phy_freq, - vclk_freq, vclk_freq, vclk_freq, false); +meson_vclk_setup (priv,MESON_VCLK_TARGET_DMT , phy_freq /1000ULL , + vclk_freq /1000ULL , vclk_freq /1000ULL , + vclk_freq /1000ULL , false);return ; }
@@ -107,12 +108,9 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi,if (mode->flags &DRM_MODE_FLAG_DBLCLK ) venc_freq /=2 ; -dev_dbg (priv->dev,"vclk:%d phy=%d venc=%d hdmi=%d enci=%d\n" , - phy_freq, vclk_freq, venc_freq, hdmi_freq, - priv->venc.hdmi_use_enci); - -meson_vclk_setup (priv,MESON_VCLK_TARGET_HDMI , phy_freq, vclk_freq, - venc_freq, hdmi_freq, priv->venc.hdmi_use_enci); +meson_vclk_setup (priv,MESON_VCLK_TARGET_HDMI , phy_freq /1000ULL , + vclk_freq /1000ULL , venc_freq /1000ULL , hdmi_freq /1000ULL , + priv->venc.hdmi_use_enci); } static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bridge,
@@ -122,10 +120,10 @@ static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bristruct meson_encoder_hdmi *encoder_hdmi =bridge_to_meson_encoder_hdmi (bridge);struct meson_drm *priv = encoder_hdmi->priv;bool is_hdmi2_sink = display_info->hdmi.scdc.supported; -unsigned int phy_freq; -unsigned int vclk_freq; -unsigned int venc_freq; -unsigned int hdmi_freq; +unsigned long long vclk_freq; +unsigned long long phy_freq; +unsigned long long venc_freq; +unsigned long long hdmi_freq;int vic =drm_match_cea_mode (mode);enum drm_mode_status status;
@@ -149,7 +147,7 @@ static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bri }else if (!meson_venc_hdmi_supported_vic (vic))return MODE_BAD ; - vclk_freq = mode->clock; + vclk_freq = mode->clock *1000ULL ;/* For 420, pixel clock is half unlike venc clock */ if (drm_mode_is_420_only(display_info, mode) ||
@@ -179,10 +177,12 @@ static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *briif (mode->flags &DRM_MODE_FLAG_DBLCLK ) venc_freq /=2 ; -dev_dbg (priv->dev,"%s: vclk:%d phy=%d venc=%d hdmi=%d\n" , - __func__, phy_freq, vclk_freq, venc_freq, hdmi_freq); +dev_dbg (priv->dev,"%s: phy=%lld vclk=%lld venc=%lld hdmi=%lld\n" , + __func__, phy_freq /1000ULL , vclk_freq /1000ULL , + venc_freq /1000ULL , hdmi_freq /1000ULL ); -return meson_vclk_vic_supported_freq (priv, phy_freq, vclk_freq); +return meson_vclk_vic_supported_freq (priv, phy_freq /1000ULL , + vclk_freq /1000ULL ); } static void meson_encoder_hdmi_atomic_enable(struct drm_bridge *bridge,
drivers/gpu/drm/meson/meson_vclk.c +2 -1
@@ -1070,7 +1070,8 @@ void meson_vclk_setup(struct meson_drm *priv, unsigned int target,for (freq =0 ; params[freq].pixel_freq ; ++freq) {if ((phy_freq == params[freq].phy_freq || - phy_freq ==FREQ_1000_1001 (params[freq].phy_freq/10 )*10 ) && + phy_freq ==FREQ_1000_1001 (params[freq].phy_freq/10 )*10 || + ((phy_freq/10 )*10 ) ==FREQ_1000_1001 (params[freq].phy_freq/10 )*10 ) && (vclk_freq == params[freq].vclk_freq || vclk_freq ==FREQ_1000_1001 (params[freq].vclk_freq))) {if (vclk_freq != params[freq].vclk_freq)
Signature · 1 line
2.34.1
Maxime Ripard
maintainerRe: [PATCH 2/2] drm/meson: vclk: fix precision in vclk calculations
Hi,
Quoted 33 lines · Christian Hewitt
Playing YUV420 @ 59.94 media causes HDMI output to lose sync with a fatal error reported:
[ 89.610280] Fatal Error, invalid HDMI vclk freq 593406In
meson_encoder_hdmi_set_vclkthe initialvclk_freqvalue is 593407 but YUV420 modes halve the value to 296703.5 and this is stored as int which loses precision by rounding down to 296703. The rounded value is later doubled to 593406 and thenmeson_encoder_hdmi_set_vclksets an invalidvclk_freqvalue and the error triggers duringmeson_vlkc_setupvalidation.Fix precision in
meson_encoder_hdmi_set_vclkby switching to unsigned long long KHz values instead of int MHz. As values forphy_freqare now more accurate we also need to handle an additional match scenario inmeson_vclk_setup.Fixes e5fab2ec9ca4 ("drm/meson: vclk: add support for YUV420 setup")Signed-off-by Christian Hewitt <[email protected]>--- drivers/gpu/drm/meson/meson_encoder_hdmi.c | 42 +++++++++++----------- drivers/gpu/drm/meson/meson_vclk.c | 3 +- 2 files changed, 23 insertions(+), 22 deletions(-)drivers/gpu/drm/meson/meson_encoder_hdmi.c +0
-1@@ -70,12 +70,12 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, {struct meson_drm *priv = encoder_hdmi->priv;int vic =drm_match_cea_mode (mode); -unsigned int phy_freq;
drivers/gpu/drm/meson/meson_encoder_hdmi.c static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, · line 78
Quoted 10 lines
drivers/gpu/drm/meson/meson_encoder_hdmi.c +5
-4-unsigned int vclk_freq; -unsigned int venc_freq; -unsigned int hdmi_freq; +unsigned long long vclk_freq; +unsigned long long phy_freq; +unsigned long long venc_freq; +unsigned long long hdmi_freq; - vclk_freq = mode->clock; + vclk_freq = mode->clock *1000ULL ;
You should be using drm_hdmi_compute_mode_clock() here
Quoted 46 lines
drivers/gpu/drm/meson/meson_encoder_hdmi.c +10
-12/* For 420, pixel clock is half unlike venc clock */ if (encoder_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_UYYVYY8_0_5X24 )@@ -85,8 +85,9 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, phy_freq = vclk_freq *10 ;if (!vic) { -meson_vclk_setup (priv,MESON_VCLK_TARGET_DMT , phy_freq, - vclk_freq, vclk_freq, vclk_freq, false); +meson_vclk_setup (priv,MESON_VCLK_TARGET_DMT , phy_freq /1000ULL , + vclk_freq /1000ULL , vclk_freq /1000ULL , + vclk_freq /1000ULL , false);return ; }@@ -107,12 +108,9 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi,if (mode->flags &DRM_MODE_FLAG_DBLCLK ) venc_freq /=2 ; -dev_dbg (priv->dev,"vclk:%d phy=%d venc=%d hdmi=%d enci=%d\n" , - phy_freq, vclk_freq, venc_freq, hdmi_freq, - priv->venc.hdmi_use_enci); - -meson_vclk_setup (priv,MESON_VCLK_TARGET_HDMI , phy_freq, vclk_freq, - venc_freq, hdmi_freq, priv->venc.hdmi_use_enci); +meson_vclk_setup (priv,MESON_VCLK_TARGET_HDMI , phy_freq /1000ULL , + vclk_freq /1000ULL , venc_freq /1000ULL , hdmi_freq /1000ULL , + priv->venc.hdmi_use_enci); } static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bridge,@@ -122,10 +120,10 @@ static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bristruct meson_encoder_hdmi *encoder_hdmi =bridge_to_meson_encoder_hdmi (bridge);struct meson_drm *priv = encoder_hdmi->priv;bool is_hdmi2_sink = display_info->hdmi.scdc.supported; -unsigned int phy_freq; -unsigned int vclk_freq; -unsigned int venc_freq; -unsigned int hdmi_freq; +unsigned long long vclk_freq; +unsigned long long phy_freq; +unsigned long long venc_freq; +unsigned long long hdmi_freq;int vic =drm_match_cea_mode (mode);enum drm_mode_status status;
drivers/gpu/drm/meson/meson_encoder_hdmi.c static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bri · line 150
Quoted 5 lines
drivers/gpu/drm/meson/meson_encoder_hdmi.c +1
-1@@ -149,7 +147,7 @@ static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bri }else if (!meson_venc_hdmi_supported_vic (vic))return MODE_BAD ; - vclk_freq = mode->clock; + vclk_freq = mode->clock *1000ULL ;
And here too.
Maxime
Re: [PATCH 2/2] drm/meson: vclk: fix precision in vclk calculations
Quoted 46 lines · Maxime Ripard
Hi,
Quoted 41 lines · Christian Hewitt
Playing YUV420 @ 59.94 media causes HDMI output to lose sync with a fatal error reported:
[ 89.610280] Fatal Error, invalid HDMI vclk freq 593406In
meson_encoder_hdmi_set_vclkthe initialvclk_freqvalue is 593407 but YUV420 modes halve the value to 296703.5 and this is stored as int which loses precision by rounding down to 296703. The rounded value is later doubled to 593406 and thenmeson_encoder_hdmi_set_vclksets an invalidvclk_freqvalue and the error triggers duringmeson_vlkc_setupvalidation.Fix precision in
meson_encoder_hdmi_set_vclkby switching to unsigned long long KHz values instead of int MHz. As values forphy_freqare now more accurate we also need to handle an additional match scenario inmeson_vclk_setup.Fixes e5fab2ec9ca4 ("drm/meson: vclk: add support for YUV420 setup")Signed-off-by Christian Hewitt <[email protected]>---
drivers/gpu/drm/meson/meson_encoder_hdmi.c| 42 +++++++++++-----------drivers/gpu/drm/meson/meson_vclk.c| 3 +-2 files changed, 23 insertions(+), 22 deletions(-)drivers/gpu/drm/meson/meson_encoder_hdmi.c +4
-4@@ -70,12 +70,12 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, {struct meson_drm *priv = encoder_hdmi->priv;int vic =drm_match_cea_mode (mode); -unsigned int phy_freq; -unsigned int vclk_freq; -unsigned int venc_freq; -unsigned int hdmi_freq; +unsigned long long vclk_freq; +unsigned long long phy_freq; +unsigned long long venc_freq; +unsigned long long hdmi_freq;
Quoted 4 lines
drivers/gpu/drm/meson/meson_encoder_hdmi.c static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, · line 78
Quoted 2 lines
drivers/gpu/drm/meson/meson_encoder_hdmi.c +1
-1- vclk_freq = mode->clock; + vclk_freq = mode->clock *1000ULL ;You should be using
drm_hdmi_compute_mode_clock()here
Hello Maxime,
If we’re talking a one-two line change than I’d like pointers and guidance on how to go about that (offline to avoid group noise). I have only rudimentary c skills though, so anything that looks like replumbing a driver around drm_connector is way beyond my current drm code and general coding knowledge; I can only offer a fix not a proper improvement :(
Christian
Quoted 55 lines
/* For 420, pixel clock is half unlike venc clock */
Quoted 45 lines
drivers/gpu/drm/meson/meson_encoder_hdmi.c +10
-12if (encoder_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_UYYVYY8_0_5X24 )@@ -85,8 +85,9 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, phy_freq = vclk_freq *10 ;if (!vic) { -meson_vclk_setup (priv,MESON_VCLK_TARGET_DMT , phy_freq, - vclk_freq, vclk_freq, vclk_freq, false); +meson_vclk_setup (priv,MESON_VCLK_TARGET_DMT , phy_freq /1000ULL , + vclk_freq /1000ULL , vclk_freq /1000ULL , + vclk_freq /1000ULL , false);return ; }@@ -107,12 +108,9 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi,if (mode->flags &DRM_MODE_FLAG_DBLCLK ) venc_freq /=2 ; -dev_dbg (priv->dev,"vclk:%d phy=%d venc=%d hdmi=%d enci=%d\n" , - phy_freq, vclk_freq, venc_freq, hdmi_freq, - priv->venc.hdmi_use_enci); - -meson_vclk_setup (priv,MESON_VCLK_TARGET_HDMI , phy_freq, vclk_freq, - venc_freq, hdmi_freq, priv->venc.hdmi_use_enci); +meson_vclk_setup (priv,MESON_VCLK_TARGET_HDMI , phy_freq /1000ULL , + vclk_freq /1000ULL , venc_freq /1000ULL , hdmi_freq /1000ULL , + priv->venc.hdmi_use_enci); } static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bridge,@@ -122,10 +120,10 @@ static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bristruct meson_encoder_hdmi *encoder_hdmi =bridge_to_meson_encoder_hdmi (bridge);struct meson_drm *priv = encoder_hdmi->priv;bool is_hdmi2_sink = display_info->hdmi.scdc.supported; -unsigned int phy_freq; -unsigned int vclk_freq; -unsigned int venc_freq; -unsigned int hdmi_freq; +unsigned long long vclk_freq; +unsigned long long phy_freq; +unsigned long long venc_freq; +unsigned long long hdmi_freq;int vic =drm_match_cea_mode (mode);enum drm_mode_status status;drivers/gpu/drm/meson/meson_encoder_hdmi.c static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bri · line 150
Quoted 5 lines
drivers/gpu/drm/meson/meson_encoder_hdmi.c +1
-1@@ -149,7 +147,7 @@ static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bri }else if (!meson_venc_hdmi_supported_vic (vic))return MODE_BAD ; - vclk_freq = mode->clock; + vclk_freq = mode->clock *1000ULL ;And here too.
Maxime
Neil Armstrong
maintainerRe: [PATCH 2/2] drm/meson: vclk: fix precision in vclk calculations
In reply to Maxime RipardQuoted 44 lines · Maxime Ripard
Hi,
Quoted 41 lines · Christian Hewitt
Playing YUV420 @ 59.94 media causes HDMI output to lose sync with a fatal error reported:
[ 89.610280] Fatal Error, invalid HDMI vclk freq 593406In
meson_encoder_hdmi_set_vclkthe initialvclk_freqvalue is 593407 but YUV420 modes halve the value to 296703.5 and this is stored as int which loses precision by rounding down to 296703. The rounded value is later doubled to 593406 and thenmeson_encoder_hdmi_set_vclksets an invalidvclk_freqvalue and the error triggers duringmeson_vlkc_setupvalidation.Fix precision in
meson_encoder_hdmi_set_vclkby switching to unsigned long long KHz values instead of int MHz. As values forphy_freqare now more accurate we also need to handle an additional match scenario inmeson_vclk_setup.Fixes e5fab2ec9ca4 ("drm/meson: vclk: add support for YUV420 setup")Signed-off-by Christian Hewitt <[email protected]>--- drivers/gpu/drm/meson/meson_encoder_hdmi.c | 42 +++++++++++----------- drivers/gpu/drm/meson/meson_vclk.c | 3 +- 2 files changed, 23 insertions(+), 22 deletions(-)drivers/gpu/drm/meson/meson_encoder_hdmi.c +4
-4@@ -70,12 +70,12 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, {struct meson_drm *priv = encoder_hdmi->priv;int vic =drm_match_cea_mode (mode); -unsigned int phy_freq; -unsigned int vclk_freq; -unsigned int venc_freq; -unsigned int hdmi_freq; +unsigned long long vclk_freq; +unsigned long long phy_freq; +unsigned long long venc_freq; +unsigned long long hdmi_freq;
Quoted 4 lines
drivers/gpu/drm/meson/meson_encoder_hdmi.c static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, · line 78
Quoted 2 lines
drivers/gpu/drm/meson/meson_encoder_hdmi.c +1
-1- vclk_freq = mode->clock; + vclk_freq = mode->clock *1000ULL ;You should be using
drm_hdmi_compute_mode_clock()here
Yes in a second time, this simply fixes the actual calculations so it can be backported to stable kernel to make the feature work again.
And yes at some point we should switch to hdmi helpers in a separate forward changeset.
Neil
Quoted 58 lines
Quoted 49 lines
drivers/gpu/drm/meson/meson_encoder_hdmi.c +10
-12/* For 420, pixel clock is half unlike venc clock */ if (encoder_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_UYYVYY8_0_5X24 )@@ -85,8 +85,9 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, phy_freq = vclk_freq *10 ;if (!vic) { -meson_vclk_setup (priv,MESON_VCLK_TARGET_DMT , phy_freq, - vclk_freq, vclk_freq, vclk_freq, false); +meson_vclk_setup (priv,MESON_VCLK_TARGET_DMT , phy_freq /1000ULL , + vclk_freq /1000ULL , vclk_freq /1000ULL , + vclk_freq /1000ULL , false);return ; }@@ -107,12 +108,9 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi,if (mode->flags &DRM_MODE_FLAG_DBLCLK ) venc_freq /=2 ; -dev_dbg (priv->dev,"vclk:%d phy=%d venc=%d hdmi=%d enci=%d\n" , - phy_freq, vclk_freq, venc_freq, hdmi_freq, - priv->venc.hdmi_use_enci); - -meson_vclk_setup (priv,MESON_VCLK_TARGET_HDMI , phy_freq, vclk_freq, - venc_freq, hdmi_freq, priv->venc.hdmi_use_enci); +meson_vclk_setup (priv,MESON_VCLK_TARGET_HDMI , phy_freq /1000ULL , + vclk_freq /1000ULL , venc_freq /1000ULL , hdmi_freq /1000ULL , + priv->venc.hdmi_use_enci); } static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bridge,@@ -122,10 +120,10 @@ static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bristruct meson_encoder_hdmi *encoder_hdmi =bridge_to_meson_encoder_hdmi (bridge);struct meson_drm *priv = encoder_hdmi->priv;bool is_hdmi2_sink = display_info->hdmi.scdc.supported; -unsigned int phy_freq; -unsigned int vclk_freq; -unsigned int venc_freq; -unsigned int hdmi_freq; +unsigned long long vclk_freq; +unsigned long long phy_freq; +unsigned long long venc_freq; +unsigned long long hdmi_freq;int vic =drm_match_cea_mode (mode);enum drm_mode_status status;drivers/gpu/drm/meson/meson_encoder_hdmi.c static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bri · line 150
Quoted 5 lines
drivers/gpu/drm/meson/meson_encoder_hdmi.c +1
-1@@ -149,7 +147,7 @@ static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bri }else if (!meson_venc_hdmi_supported_vic (vic))return MODE_BAD ; - vclk_freq = mode->clock; + vclk_freq = mode->clock *1000ULL ;And here too.
Maxime
kernel test robot
build botRe: [PATCH 2/2] drm/meson: vclk: fix precision in vclk calculations
In reply to Christian Hewittkernel test robot noticed the following build errors:
Hi Christian,
kernel test robot noticed the following build errors:
[auto build test ERROR on linus/master]
[also build test ERROR on v6.13 next-20250120]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Christian-Hewitt/Revert-drm-meson-vclk-fix-calculation-of-59-94-fractional-rates/20250110-154701 base: linus/master patch link: https://lore.kernel.org/r/20250110074458.3624094-3-christianshewitt%40gmail.com patch subject: [PATCH 2/2] drm/meson: vclk: fix precision in vclk calculations config: arm-randconfig-r072-20250118 (https://download.01.org/0day-ci/archive/20250121/[email protected]/config) compiler: clang version 20.0.0git (https://github.com/llvm/llvm-project c23f2417dc5f6dc371afb07af5627ec2a9d373a0) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250121/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>, old ones prefixed by <<):
WARNING: modpost: missing MODULE_DESCRIPTION() in arch/arm/probes/kprobes/test-kprobes.o
WARNING: modpost: missing MODULE_DESCRIPTION() in lib/slub_kunit.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/staging/gpib/fmh_gpib/fmh_gpib.o
>> ERROR: modpost: "__aeabi_uldivmod" [drivers/gpu/drm/meson/meson-drm.ko] undefined!
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Neil Armstrong
maintainerRe: [PATCH 2/2] drm/meson: vclk: fix precision in vclk calculations
Hi,
Quoted 23 lines · kernel test robot
Hi Christian,
kernel test robot noticed the following build errors:
[auto build test ERROR on linus/master]
[also build test ERROR on v6.13 next-20250120]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]url: https://github.com/intel-lab-lkp/linux/commits/Christian-Hewitt/Revert-drm-meson-vclk-fix-calculation-of-59-94-fractional-rates/20250110-154701 base: linus/master patch link: https://lore.kernel.org/r/20250110074458.3624094-3-christianshewitt%40gmail.com patch subject: [PATCH 2/2] drm/meson: vclk: fix precision in vclk calculations config: arm-randconfig-r072-20250118 (https://download.01.org/0day-ci/archive/20250121/[email protected]/config) compiler: clang version 20.0.0git (https://github.com/llvm/llvm-project c23f2417dc5f6dc371afb07af5627ec2a9d373a0) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250121/[email protected]/reproduce)If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
Quoted 7 lines
All errors (new ones prefixed by >>, old ones prefixed by <<):
WARNING: modpost: missing
MODULE_DESCRIPTION()inarch/arm/probes/kprobes/test-kprobes.o
WARNING: modpost: missingMODULE_DESCRIPTION()inlib/slub_kunit.o
WARNING: modpost: missingMODULE_DESCRIPTION()indrivers/staging/gpib/fmh_gpib/fmh_gpib.oQuoted 1 line
Quoted 1 line
ERROR: modpost: "
__aeabi_uldivmod" [drivers/gpu/drm/meson/meson-drm.ko] undefined!
Please use do_div() when dividing 64bit numbers to please 32-bit platforms.
Neil
Quoted 14 lines · Christian Hewitt
Patch 1 reverts a previous fix for loss of HDMI sync when playing YUV420 @ 59.94 media. The patch does resolve a calculation issue. It also makes all fractional rates invalid which is a bigger problem.
Patch 2 provides a proper fix after I figured out the actual root cause of the original problem. This time the maths checks out.
Apologies to the stable team as the original patch has been applied to a wide range of older and LTS kernels (as far as 5.10). Please let me know if combining the two patches into a single 'fix the previous fix' patch would be preferred?
Christian
Quoted 8 lines
Christian Hewitt (2):
Revert "drm/meson: vclk: fix calculation of 59.94 fractional rates" drm/meson: vclk: fix precision in vclk calculationsdrivers/gpu/drm/meson/meson_encoder_hdmi.c | 42 +++++++++++----------- drivers/gpu/drm/meson/meson_vclk.c | 7 ++-- 2 files changed, 25 insertions(+), 24 deletions(-)
LGTM