make mt7623 clock of hdmi stable
Subsystems (4)
v6 cover make mt7623 clock of hdmi stable
From: Wangyan Wang <[email protected]>
V6 adopt maintainer's suggestion.
Here is the change list between V5 & V6
1. change "unsigned char mux_flags;" to "u8 mux_flags;" to match with the struct in " clk: mediatek: add MUX_GATE_FLAGS_2".
chunhui dai (8):
drm/mediatek: recalculate hdmi phy clock of MT2701 by querying
hardware
drm/mediatek: move the setting of fixed divider drm/mediatek: using different flags of clk for HDMI phy drm/mediatek: fix the rate and divder of hdmi phy for MT2701
clk: mediatek: add MUX_GATE_FLAGS_2
clk: mediatek: using CLK_MUX_ROUND_CLOSEST for the clock of dpi1_sel drm/mediatek: using new factor for tvdpll in MT2701 drm/mediatek: fix the rate of parent for hdmi phy in MT2701
drivers/clk/mediatek/clk-mt2701.c | 4 +- drivers/clk/mediatek/clk-mtk.c | 2 +- drivers/clk/mediatek/clk-mtk.h | 20 ++++++--- drivers/gpu/drm/mediatek/mtk_dpi.c | 8 ++-- drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 34 ++++------------ drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 7 +--- drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 56 +++++++++++++++++++++++--- drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 23 +++++++++++ 8 files changed, 102 insertions(+), 52 deletions(-)
Signature · 1 line
2.14.1
PATCH v6 1/8 drm/mediatek: recalculate hdmi phy clock of MT2701 by querying hardware
From: chunhui dai <[email protected]>
Recalculate the rate of this clock, by querying hardware.
--- drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 7 ++---- drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 3 +-- drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 35 ++++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 8 ++++++ 4 files changed, 46 insertions(+), 7 deletions(-)
drivers/gpu/drm/mediatek/mtk_hdmi_phy.c +2 -5
@@ -29,12 +29,9 @@ long mtk_hdmi_pll_round_rate(struct clk_hw *hw, unsigned long rate,return rate; } -unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, -unsigned long parent_rate) +u32 mtk_hdmi_phy_read (struct mtk_hdmi_phy *hdmi_phy,u32 offset) { -struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); - -return hdmi_phy->pll_rate; +return readl (hdmi_phy->regs + offset); } void mtk_hdmi_phy_clear_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,
drivers/gpu/drm/mediatek/mtk_hdmi_phy.h +1 -2
@@ -41,6 +41,7 @@ struct mtk_hdmi_phy {unsigned int ibias_up; }; +u32 mtk_hdmi_phy_read (struct mtk_hdmi_phy *hdmi_phy,u32 offset);void mtk_hdmi_phy_clear_bits (struct mtk_hdmi_phy *hdmi_phy,u32 offset,u32 bits); void mtk_hdmi_phy_set_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,
@@ -50,8 +51,6 @@ void mtk_hdmi_phy_mask(struct mtk_hdmi_phy *hdmi_phy, u32 offset,struct mtk_hdmi_phy *to_mtk_hdmi_phy (struct clk_hw *hw);long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate,unsigned long *parent_rate); -unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, -unsigned long parent_rate);extern struct platform_driver mtk_hdmi_phy_driver;extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf;
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +35 -0
@@ -153,6 +153,41 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, RG_HDMITX_DRV_IBIAS_MASK);return 0 ; } +static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); +unsigned long out_rate, val; + + val = (mtk_hdmi_phy_read (hdmi_phy,HDMI_CON6 ) + &RG_HTPLL_PREDIV_MASK ) >>RG_HTPLL_PREDIV ; +switch (val) { +case 0x00 : + out_rate = parent_rate; +break ; +case 0x01 : + out_rate = parent_rate /2 ; +break ; +default : + out_rate = parent_rate /4 ; +break ; + } + + val = (mtk_hdmi_phy_read (hdmi_phy,HDMI_CON6 ) + &RG_HTPLL_FBKDIV_MASK ) >>RG_HTPLL_FBKDIV ; + out_rate *= (val +1 ) *2 ; + val = (mtk_hdmi_phy_read (hdmi_phy,HDMI_CON2 ) + &RG_HDMITX_TX_POSDIV_MASK ); + + out_rate >>= (val >>RG_HDMITX_TX_POSDIV ); + +if (mtk_hdmi_phy_read (hdmi_phy,HDMI_CON2 ) &RG_HDMITX_EN_TX_POSDIV ) + out_rate = out_rate /5 ; + + hdmi_phy->pll_rate = out_rate; + +return hdmi_phy->pll_rate; +}static const struct clk_ops mtk_hdmi_phy_pll_ops = { .prepare = mtk_hdmi_pll_prepare,
drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c +8 -0
@@ -285,6 +285,14 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,return 0 ; } +static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); + +return hdmi_phy->pll_rate; +} +static const struct clk_ops mtk_hdmi_phy_pll_ops = { .prepare = mtk_hdmi_pll_prepare, .unprepare = mtk_hdmi_pll_unprepare,
Signature · 1 line
2.14.1
Re: [PATCH v6 1/8] drm/mediatek: recalculate hdmi phy clock of MT2701 by querying hardware
Hi, Wangyan:
Quoted 82 lines · wangyan wang
From: chunhui dai <[email protected]>
Recalculate the rate of this clock, by querying hardware.
Signed-off-by chunhui dai <[email protected]>Signed-off-by wangyan wang <[email protected]>--- drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 7 ++---- drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 3 +-- drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 35 ++++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 8 ++++++ 4 files changed, 46 insertions(+), 7 deletions(-)drivers/gpu/drm/mediatek/mtk_hdmi_phy.c +2
-5@@ -29,12 +29,9 @@ long mtk_hdmi_pll_round_rate(struct clk_hw *hw, unsigned long rate,return rate; } -unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, -unsigned long parent_rate) +u32 mtk_hdmi_phy_read (struct mtk_hdmi_phy *hdmi_phy,u32 offset) { -struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); - -return hdmi_phy->pll_rate; +return readl (hdmi_phy->regs + offset); } void mtk_hdmi_phy_clear_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,drivers/gpu/drm/mediatek/mtk_hdmi_phy.h +1
-2@@ -41,6 +41,7 @@ struct mtk_hdmi_phy {unsigned int ibias_up; }; +u32 mtk_hdmi_phy_read (struct mtk_hdmi_phy *hdmi_phy,u32 offset);void mtk_hdmi_phy_clear_bits (struct mtk_hdmi_phy *hdmi_phy,u32 offset,u32 bits); void mtk_hdmi_phy_set_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,@@ -50,8 +51,6 @@ void mtk_hdmi_phy_mask(struct mtk_hdmi_phy *hdmi_phy, u32 offset,struct mtk_hdmi_phy *to_mtk_hdmi_phy (struct clk_hw *hw);long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate,unsigned long *parent_rate); -unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, -unsigned long parent_rate);extern struct platform_driver mtk_hdmi_phy_driver;extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf;drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +21
-0@@ -153,6 +153,41 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, RG_HDMITX_DRV_IBIAS_MASK);return 0 ; } +static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); +unsigned long out_rate, val; + + val = (mtk_hdmi_phy_read (hdmi_phy,HDMI_CON6 ) + &RG_HTPLL_PREDIV_MASK ) >>RG_HTPLL_PREDIV ; +switch (val) { +case 0x00 : + out_rate = parent_rate; +break ; +case 0x01 : + out_rate = parent_rate /2 ; +break ; +default : + out_rate = parent_rate /4 ; +break ; + } + + val = (mtk_hdmi_phy_read(hdmi_phy, HDMI_CON6)
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, · line 186
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +10
-0+ & RG_HTPLL_FBKDIV_MASK) >> RG_HTPLL_FBKDIV; + out_rate *= (val +1 ) *2 ; + val = (mtk_hdmi_phy_read (hdmi_phy,HDMI_CON2 ) + &RG_HDMITX_TX_POSDIV_MASK ); + + out_rate >>= (val >>RG_HDMITX_TX_POSDIV ); + +if (mtk_hdmi_phy_read (hdmi_phy,HDMI_CON2 ) &RG_HDMITX_EN_TX_POSDIV ) + out_rate = out_rate /5 ; +
All the register you read here is set in mtk_hdmi_pll_set_rate(), so I think you could determine the out_rate in mtk_hdmi_pll_set_rate().
Regards,
CK
Quoted 26 lines
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +4
-0+ hdmi_phy->pll_rate = out_rate; + +return hdmi_phy->pll_rate; +}static const struct clk_ops mtk_hdmi_phy_pll_ops = { .prepare = mtk_hdmi_pll_prepare,drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c +8
-0@@ -285,6 +285,14 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,return 0 ; } +static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); + +return hdmi_phy->pll_rate; +} +static const struct clk_ops mtk_hdmi_phy_pll_ops = { .prepare = mtk_hdmi_pll_prepare, .unprepare = mtk_hdmi_pll_unprepare,
Re: [PATCH v6 1/8] drm/mediatek: recalculate hdmi phy clock of MT2701 by querying hardware
Hi, Wangyan:
Quoted 90 lines · CK Hu
Hi, Wangyan:
Quoted 87 lines · wangyan wang
From: chunhui dai <[email protected]>
Recalculate the rate of this clock, by querying hardware.
Signed-off-by chunhui dai <[email protected]>Signed-off-by wangyan wang <[email protected]>--- drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 7 ++---- drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 3 +-- drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 35 ++++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 8 ++++++ 4 files changed, 46 insertions(+), 7 deletions(-)drivers/gpu/drm/mediatek/mtk_hdmi_phy.c +2
-5@@ -29,12 +29,9 @@ long mtk_hdmi_pll_round_rate(struct clk_hw *hw, unsigned long rate,return rate; } -unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, -unsigned long parent_rate) +u32 mtk_hdmi_phy_read (struct mtk_hdmi_phy *hdmi_phy,u32 offset) { -struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); - -return hdmi_phy->pll_rate; +return readl (hdmi_phy->regs + offset); } void mtk_hdmi_phy_clear_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,drivers/gpu/drm/mediatek/mtk_hdmi_phy.h +1
-2@@ -41,6 +41,7 @@ struct mtk_hdmi_phy {unsigned int ibias_up; }; +u32 mtk_hdmi_phy_read (struct mtk_hdmi_phy *hdmi_phy,u32 offset);void mtk_hdmi_phy_clear_bits (struct mtk_hdmi_phy *hdmi_phy,u32 offset,u32 bits); void mtk_hdmi_phy_set_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,@@ -50,8 +51,6 @@ void mtk_hdmi_phy_mask(struct mtk_hdmi_phy *hdmi_phy, u32 offset,struct mtk_hdmi_phy *to_mtk_hdmi_phy (struct clk_hw *hw);long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate,unsigned long *parent_rate); -unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, -unsigned long parent_rate);extern struct platform_driver mtk_hdmi_phy_driver;extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf;drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +26
-0@@ -153,6 +153,41 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, RG_HDMITX_DRV_IBIAS_MASK);return 0 ; } +static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); +unsigned long out_rate, val; + + val = (mtk_hdmi_phy_read (hdmi_phy,HDMI_CON6 ) + &RG_HTPLL_PREDIV_MASK ) >>RG_HTPLL_PREDIV ; +switch (val) { +case 0x00 : + out_rate = parent_rate; +break ; +case 0x01 : + out_rate = parent_rate /2 ; +break ; +default : + out_rate = parent_rate /4 ; +break ; + } + + val = (mtk_hdmi_phy_read (hdmi_phy,HDMI_CON6 ) + &RG_HTPLL_FBKDIV_MASK ) >>RG_HTPLL_FBKDIV ; + out_rate *= (val +1 ) *2 ; + val = (mtk_hdmi_phy_read (hdmi_phy,HDMI_CON2 ) + &RG_HDMITX_TX_POSDIV_MASK ); +
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, · line 186
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +5
-0+ out_rate >>= (val >>RG_HDMITX_TX_POSDIV ); + +if (mtk_hdmi_phy_read (hdmi_phy,HDMI_CON2 ) &RG_HDMITX_EN_TX_POSDIV ) + out_rate = out_rate /5 ; +All the register you read here is set in
mtk_hdmi_pll_set_rate(), so I think you could determine theout_rateinmtk_hdmi_pll_set_rate().
As offline discuss, you mention that when
cat /sys/kernel/debug/ckl/clk_summary, mtk_hdmi_pll_recalc_rate() is called, so read register to get the real clock. The clk_summary call clk_core_get_rate() to get rate, and clk_core_get_rate() would check the flag CLK_GET_RATE_NOCACHE to call __clk_recalc_rates(), but mtk_hdmi_phy does not have this flag, so this function would not be called when clk_summary. So I still think you could determine the out_rate in mtk_hdmi_pll_set_rate().
Regards,
CK
Quoted 19 lines
Regards,
CKQuoted 15 lines
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +4
-0+ hdmi_phy->pll_rate = out_rate; + +return hdmi_phy->pll_rate; +}static const struct clk_ops mtk_hdmi_phy_pll_ops = { .prepare = mtk_hdmi_pll_prepare,drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c +0
-0@@ -285,6 +285,14 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,return 0 ; }
Quoted 12 lines
drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, · line 298
Quoted 11 lines
drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c +8
-0+static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); + +return hdmi_phy->pll_rate; +} +static const struct clk_ops mtk_hdmi_phy_pll_ops = { .prepare = mtk_hdmi_pll_prepare, .unprepare = mtk_hdmi_pll_unprepare,
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v6 1/8] drm/mediatek: recalculate hdmi phy clock of MT2701 by querying hardware
Hi, Wangyan:
Quoted 27 lines · CK Hu
Hi, Wangyan:
Quoted 24 lines · CK Hu
Hi, Wangyan:
Quoted 21 lines · wangyan wang
From: chunhui dai <[email protected]>
Recalculate the rate of this clock, by querying hardware.
Signed-off-by chunhui dai <[email protected]>Signed-off-by wangyan wang <[email protected]>--- drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 7 ++---- drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 3 +-- drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 35 ++++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 8 ++++++ 4 files changed, 46 insertions(+), 7 deletions(-)drivers/gpu/drm/mediatek/mtk_hdmi_phy.c +0
-0@@ -29,12 +29,9 @@ long mtk_hdmi_pll_round_rate(struct clk_hw *hw, unsigned long rate,return rate; }
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_hdmi_phy.c long mtk_hdmi_pll_round_rate(struct clk_hw *hw, unsigned long rate, · line 34
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_hdmi_phy.c +2
-5-unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, -unsigned long parent_rate) +u32 mtk_hdmi_phy_read (struct mtk_hdmi_phy *hdmi_phy,u32 offset) { -struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); - -return hdmi_phy->pll_rate; +return readl (hdmi_phy->regs + offset);
Inside mtk_hdmi_pll_recalc_rate(), there is just one function, why not directly call readl() in the caller function?
Quoted 67 lines
Quoted 58 lines
Quoted 58 lines
drivers/gpu/drm/mediatek/mtk_hdmi_phy.c +0
-0} void mtk_hdmi_phy_clear_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,drivers/gpu/drm/mediatek/mtk_hdmi_phy.h +1
-2@@ -41,6 +41,7 @@ struct mtk_hdmi_phy {unsigned int ibias_up; }; +u32 mtk_hdmi_phy_read (struct mtk_hdmi_phy *hdmi_phy,u32 offset);void mtk_hdmi_phy_clear_bits (struct mtk_hdmi_phy *hdmi_phy,u32 offset,u32 bits); void mtk_hdmi_phy_set_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,@@ -50,8 +51,6 @@ void mtk_hdmi_phy_mask(struct mtk_hdmi_phy *hdmi_phy, u32 offset,struct mtk_hdmi_phy *to_mtk_hdmi_phy (struct clk_hw *hw);long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate,unsigned long *parent_rate); -unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, -unsigned long parent_rate);extern struct platform_driver mtk_hdmi_phy_driver;extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf;drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +26
-0@@ -153,6 +153,41 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, RG_HDMITX_DRV_IBIAS_MASK);return 0 ; } +static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); +unsigned long out_rate, val; + + val = (mtk_hdmi_phy_read (hdmi_phy,HDMI_CON6 ) + &RG_HTPLL_PREDIV_MASK ) >>RG_HTPLL_PREDIV ; +switch (val) { +case 0x00 : + out_rate = parent_rate; +break ; +case 0x01 : + out_rate = parent_rate /2 ; +break ; +default : + out_rate = parent_rate /4 ; +break ; + } + + val = (mtk_hdmi_phy_read (hdmi_phy,HDMI_CON6 ) + &RG_HTPLL_FBKDIV_MASK ) >>RG_HTPLL_FBKDIV ; + out_rate *= (val +1 ) *2 ; + val = (mtk_hdmi_phy_read (hdmi_phy,HDMI_CON2 ) + &RG_HDMITX_TX_POSDIV_MASK ); +Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, · line 186
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +5
-0+ out_rate >>= (val >>RG_HDMITX_TX_POSDIV ); + +if (mtk_hdmi_phy_read (hdmi_phy,HDMI_CON2 ) &RG_HDMITX_EN_TX_POSDIV ) + out_rate = out_rate /5 ; +All the register you read here is set in
mtk_hdmi_pll_set_rate(), so I think you could determine theout_rateinmtk_hdmi_pll_set_rate().
Quoted 8 lines
As offline discuss, you mention that when
cat/sys/kernel/debug/ckl/clk_summary,mtk_hdmi_pll_recalc_rate()is called, so read register to get the real clock. Theclk_summarycallclk_core_get_rate()to get rate, andclk_core_get_rate()would check the flagCLK_GET_RATE_NOCACHEto call__clk_recalc_rates(), butmtk_hdmi_phydoes not have this flag, so this function would not be called whenclk_summary. So I still think you could determine theout_rateinmtk_hdmi_pll_set_rate().
As offline discuss, recalc_rate is defined as follow:
* @recalc_rate Recalculate the rate of this clock, by querying
hardware. The
* parent rate is an input parameter. It is up to the caller to
* ensure that the prepare_mutex is held across this call.
* Returns the calculated rate. Optional, but recommended - if
* this op is not set then clock rate will be initialized to 0.
So it looks that recalc_rate is expected to query hardware to get the out_rate. So this implementation is OK.
Quoted 9 lines
Regards,
CKQuoted 5 lines
Regards,
CKdrivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, · line 187
Quoted 1 line
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +1
-0+ hdmi_phy->pll_rate = out_rate;
I think you don't need to assign hdmi_phy->pll_rate in MT2701 because it's useless in MT2701.
Regards,
CK
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +3
-0+ +return hdmi_phy->pll_rate; +}static const struct clk_ops mtk_hdmi_phy_pll_ops = { .prepare = mtk_hdmi_pll_prepare,drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c +0
-0@@ -285,6 +285,14 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,return 0 ; }
Quoted 13 lines
Quoted 12 lines
drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, · line 298
Quoted 11 lines
drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c +8
-0+static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); + +return hdmi_phy->pll_rate; +} +static const struct clk_ops mtk_hdmi_phy_pll_ops = { .prepare = mtk_hdmi_pll_prepare, .unprepare = mtk_hdmi_pll_unprepare,
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v6 2/8 drm/mediatek: move the setting of fixed divider
In reply to wangyan wangFrom: chunhui dai <[email protected]>
move the setting of fixed divider from enable/disable to the function of setting rate.
the patch is for hdmi pll divider, the divder should be configured before clock calculation to ensure the clock is right.
--- drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +1 -4
@@ -79,7 +79,6 @@ static int mtk_hdmi_pll_prepare(struct clk_hw *hw)mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_SLDO_MASK );usleep_range (80 ,100 );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_MBIAS_LPF_EN ); -mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_EN_TX_POSDIV );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_SER_MASK );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_PRED_MASK );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_DRV_MASK );
@@ -94,7 +93,6 @@ static void mtk_hdmi_pll_unprepare(struct clk_hw *hw)mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_DRV_MASK );mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_PRED_MASK );mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_SER_MASK ); -mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_EN_TX_POSDIV );mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_MBIAS_LPF_EN );usleep_range (80 ,100 );mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_SLDO_MASK );
@@ -123,6 +121,7 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON6 ,RG_HTPLL_PREDIV_MASK );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON6 ,RG_HTPLL_POSDIV_MASK ); +mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_EN_TX_POSDIV );mtk_hdmi_phy_mask (hdmi_phy,HDMI_CON6 , (0x1 <<RG_HTPLL_IC ),RG_HTPLL_IC_MASK ); mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON6, (0x1 << RG_HTPLL_IR),
@@ -209,7 +208,6 @@ static void mtk_hdmi_phy_enable_tmds(struct mtk_hdmi_phy *hdmi_phy)mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_SLDO_MASK );usleep_range (80 ,100 );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_MBIAS_LPF_EN ); -mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_EN_TX_POSDIV );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_SER_MASK );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_PRED_MASK );mtk_hdmi_phy_set_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_DRV_MASK );
@@ -221,7 +219,6 @@ static void mtk_hdmi_phy_disable_tmds(struct mtk_hdmi_phy *hdmi_phy)mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_DRV_MASK );mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_PRED_MASK );mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_SER_MASK ); -mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_EN_TX_POSDIV );mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON2 ,RG_HDMITX_MBIAS_LPF_EN );usleep_range (80 ,100 );mtk_hdmi_phy_clear_bits (hdmi_phy,HDMI_CON0 ,RG_HDMITX_EN_SLDO_MASK );
Signature · 1 line
2.14.1
PATCH v6 3/8 drm/mediatek: using different flags of clk for HDMI phy
In reply to wangyan wangFrom: chunhui dai <[email protected]>
The parent rate of hdmi phy had set by DPI driver.
We should not set or change the parent rate of MT2701 hdmi phy, as a result we should remove the flags of "CLK_SET_RATE_PARENT" from the clock of MT2701 hdmi phy.
--- drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 13 +++++-------- drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 1 + drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 1 + drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 1 + 4 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/mediatek/mtk_hdmi_phy.c +5 -8
@@ -107,13 +107,11 @@ mtk_hdmi_phy_dev_get_ops(const struct mtk_hdmi_phy *hdmi_phy)return NULL ; } -static void mtk_hdmi_phy_clk_get_ops (struct mtk_hdmi_phy *hdmi_phy, -const struct clk_ops **ops) +static void mtk_hdmi_phy_clk_get_data (struct mtk_hdmi_phy *hdmi_phy, +struct clk_init_data *clk_init) { -if (hdmi_phy && hdmi_phy->conf && hdmi_phy->conf->hdmi_phy_clk_ops) - *ops = hdmi_phy->conf->hdmi_phy_clk_ops; -else -dev_err (hdmi_phy->dev,"Failed to get clk ops of phy\n" ); + clk_init->flags = hdmi_phy->conf->flags; + clk_init->ops = hdmi_phy->conf->hdmi_phy_clk_ops; }static int mtk_hdmi_phy_probe (struct platform_device *pdev)
@@ -126,7 +124,6 @@ static int mtk_hdmi_phy_probe(struct platform_device *pdev)struct clk_init_data clk_init = { .num_parents =1 , .parent_names = (const char *const *)&ref_clk_name, - .flags =CLK_SET_RATE_PARENT |CLK_SET_RATE_GATE , };struct phy *phy;
@@ -164,7 +161,7 @@ static int mtk_hdmi_phy_probe(struct platform_device *pdev) hdmi_phy->dev = dev; hdmi_phy->conf = (struct mtk_hdmi_phy_conf *)of_device_get_match_data (dev); -mtk_hdmi_phy_clk_get_ops (hdmi_phy, &clk_init.ops); +mtk_hdmi_phy_clk_get_data (hdmi_phy, &clk_init); hdmi_phy->pll_hw.init = &clk_init; hdmi_phy->pll =devm_clk_register (dev, &hdmi_phy->pll_hw);if (IS_ERR (hdmi_phy->pll)) {
drivers/gpu/drm/mediatek/mtk_hdmi_phy.h +1 -0
@@ -21,6 +21,7 @@ struct mtk_hdmi_phy;struct mtk_hdmi_phy_conf {bool tz_disabled; +unsigned long flags;const struct clk_ops *hdmi_phy_clk_ops;void (*hdmi_phy_enable_tmds)(struct mtk_hdmi_phy *hdmi_phy);void (*hdmi_phy_disable_tmds)(struct mtk_hdmi_phy *hdmi_phy);
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +1 -0
@@ -234,6 +234,7 @@ static void mtk_hdmi_phy_disable_tmds(struct mtk_hdmi_phy *hdmi_phy)struct mtk_hdmi_phy_conf mtk_hdmi_phy_2701_conf = { .tz_disabled = true, + .flags =CLK_SET_RATE_NO_REPARENT |CLK_SET_RATE_GATE , .hdmi_phy_clk_ops = &mtk_hdmi_phy_pll_ops, .hdmi_phy_enable_tmds = mtk_hdmi_phy_enable_tmds, .hdmi_phy_disable_tmds = mtk_hdmi_phy_disable_tmds,
drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c +1 -0
@@ -317,6 +317,7 @@ static void mtk_hdmi_phy_disable_tmds(struct mtk_hdmi_phy *hdmi_phy) }struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf = { + .flags =CLK_SET_RATE_PARENT |CLK_SET_RATE_GATE , .hdmi_phy_clk_ops = &mtk_hdmi_phy_pll_ops, .hdmi_phy_enable_tmds = mtk_hdmi_phy_enable_tmds, .hdmi_phy_disable_tmds = mtk_hdmi_phy_disable_tmds,
Signature · 1 line
2.14.1
PATCH v6 4/8 drm/mediatek: fix the rate and divder of hdmi phy for MT2701
In reply to wangyan wangFrom: chunhui dai <[email protected]>
Due to a clerical error,there is one zero less for 12800000. Fix it for 128000000.
--- drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +2 -2
@@ -114,8 +114,8 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,if (rate <=64000000 ) pos_div =3 ; -else if (rate <=12800000 ) - pos_div =1 ; +else if (rate <=128000000 ) + pos_div =2 ;else pos_div =1 ;
Signature · 1 line
2.14.1
PATCH v6 5/8 clk: mediatek: add MUX_GATE_FLAGS_2
In reply to wangyan wangFrom: chunhui dai <[email protected]>
Add MUX_GATE_FLAGS_2 for the clock which needs to set two falgs. Such as some mux need to set the flags of "CLK_MUX_ROUND_CLOSEST".
--- drivers/clk/mediatek/clk-mtk.c | 2 +- drivers/clk/mediatek/clk-mtk.h | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-)
drivers/clk/mediatek/clk-mtk.c +1 -1
@@ -167,7 +167,7 @@ struct clk *mtk_clk_register_composite(const struct mtk_composite *mc, mux->mask =BIT (mc->mux_width) -1 ; mux->shift = mc->mux_shift; mux->lock = lock; - + mux->flags = mc->mux_flags; mux_hw = &mux->hw; mux_ops = &clk_mux_ops;
drivers/clk/mediatek/clk-mtk.h +14 -6
@@ -81,15 +81,13 @@ struct mtk_composite {signed char divider_shift;signed char divider_width; +u8 mux_flags; +signed char num_parents; }; -/* -* In case the rate change propagation to parent clocks is undesirable, -* this macro allows to specify the clock flags manually. -*/ -#define MUX_GATE_FLAGS (_id, _name, _parents, _reg, _shift, _width, \ - _gate, _flags) { \ +#define MUX_GATE_FLAGS_2 (_id, _name, _parents, _reg, _shift, \ + _width, _gate, _flags, _muxflags) { \ .id = _id, \ .name = _name, \ .mux_reg = _reg, \
@@ -101,8 +99,18 @@ struct mtk_composite { .parent_names = _parents, \ .num_parents = ARRAY_SIZE(_parents), \ .flags = _flags, \ + .mux_flags = _muxflags, \ } +/* +* In case the rate change propagation to parent clocks is undesirable, +* this macro allows to specify the clock flags manually. +*/ +#define MUX_GATE_FLAGS (_id, _name, _parents, _reg, _shift, _width, \ + _gate, _flags) \ + MUX_GATE_FLAGS_2(_id, _name, _parents, _reg, \ + _shift, _width, _gate, _flags, 0) +/* * Unless necessary, all MUX_GATE clocks propagate rate changes to their * parent clock by default.
Signature · 1 line
2.14.1
Re: [PATCH V6 5/8] clk: mediatek: add MUX_GATE_FLAGS_2
Quoting wangyan wang (2019-02-24 18:09:09)
Quoted 8 lines
From: chunhui dai <[email protected]>
Add
MUX_GATE_FLAGS_2for the clock which needs to set two falgs. Such as some mux need to set the flags of "CLK_MUX_ROUND_CLOSEST".Signed-off-by chunhui dai <[email protected]>Signed-off-by wangyan wang <[email protected]>---
Applied to clk-next
PATCH v6 6/8 clk: mediatek: using CLK_MUX_ROUND_CLOSEST for the clock of dpi1_sel
In reply to wangyan wangFrom: chunhui dai <[email protected]>
The MUX clock of dpi1_sel should select the closet clock for itself. We could add this flag to enable this function of MUX in CCF.
--- drivers/clk/mediatek/clk-mt2701.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/mediatek/clk-mt2701.c +2 -2
@@ -535,8 +535,8 @@ static const struct mtk_composite top_muxes[] = { 0x0080, 8, 2, 15),MUX_GATE (CLK_TOP_DPI0_SEL ,"dpi0_sel" , dpi0_parents,0x0080 ,16 ,3 ,23 ), -MUX_GATE (CLK_TOP_DPI1_SEL ,"dpi1_sel" , dpi1_parents, -0x0080 ,24 ,2 ,31 ), +MUX_GATE_FLAGS_2 (CLK_TOP_DPI1_SEL ,"dpi1_sel" , dpi1_parents, +0x0080 ,24 ,2 ,31 ,0 ,CLK_MUX_ROUND_CLOSEST ),MUX_GATE (CLK_TOP_TVE_SEL ,"tve_sel" , tve_parents, 0x0090, 0, 3, 7),
Signature · 1 line
2.14.1
Re: [PATCH V6 6/8] clk: mediatek: using CLK_MUX_ROUND_CLOSEST for the clock of dpi1_sel
Quoting wangyan wang (2019-02-24 18:09:10)
Quoted 8 lines
From: chunhui dai <[email protected]>
The MUX clock of
dpi1_selshould select the closet clock for itself. We could add this flag to enable this function of MUX in CCF.Signed-off-by chunhui dai <[email protected]>Signed-off-by wangyan wang <[email protected]>---
Applied to clk-next
PATCH v6 7/8 drm/mediatek: using new factor for tvdpll in MT2701
In reply to wangyan wangFrom: chunhui dai <[email protected]>
The factor depends on the divider of DPI in MT2701, therefore, we should fix this factor to the right and new one.
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/mediatek/mtk_dpi.c +3 -5
@@ -662,13 +662,11 @@ static unsigned int mt8173_calculate_factor(int clock)static unsigned int mt2701_calculate_factor (int clock) {if (clock <=64000 ) -return 16 ; -else if (clock <=128000 ) -return 8 ; -else if (clock <=256000 )return 4 ; -else +else if (clock <=128000 )return 2 ; +else +return 1 ; }static const struct mtk_dpi_conf mt8173_conf = {
Signature · 1 line
2.14.1
PATCH v6 8/8 drm/mediatek: fix the rate of parent for hdmi phy in MT2701
In reply to wangyan wangFrom: chunhui dai <[email protected]>
We should not change the rate of parent for hdmi phy when doing round_rate for this clock. The parent clock of hdmi phy must be the same as it. We change it when doing set_rate only.
--- drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 14 -------------- drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 3 --- drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 11 +++++++++++ drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 14 ++++++++++++++ 4 files changed, 25 insertions(+), 17 deletions(-)
drivers/gpu/drm/mediatek/mtk_hdmi_phy.c +0 -14
@@ -15,20 +15,6 @@ static const struct phy_ops mtk_hdmi_phy_dev_ops = { .owner = THIS_MODULE, }; -long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, -unsigned long *parent_rate) -{ -struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); - - hdmi_phy->pll_rate = rate; -if (rate <=74250000 ) - *parent_rate = rate; -else - *parent_rate = rate /2 ; - -return rate; -} -u32 mtk_hdmi_phy_read (struct mtk_hdmi_phy *hdmi_phy,u32 offset) {return readl (hdmi_phy->regs + offset);
drivers/gpu/drm/mediatek/mtk_hdmi_phy.h +0 -3
@@ -50,9 +50,6 @@ void mtk_hdmi_phy_set_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,void mtk_hdmi_phy_mask (struct mtk_hdmi_phy *hdmi_phy,u32 offset,u32 val,u32 mask);struct mtk_hdmi_phy *to_mtk_hdmi_phy (struct clk_hw *hw); -long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, -unsigned long *parent_rate); -extern struct platform_driver mtk_hdmi_phy_driver;extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf;extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_2701_conf;
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +11 -0
@@ -152,6 +152,17 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, RG_HDMITX_DRV_IBIAS_MASK);return 0 ; } + +static long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, +unsigned long *parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); + + hdmi_phy->pll_rate = rate; + +return rate; +} +static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) {
drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c +14 -0
@@ -285,6 +285,20 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,return 0 ; } +static long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, +unsigned long *parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); + + hdmi_phy->pll_rate = rate; +if (rate <=74250000 ) + *parent_rate = rate; +else + *parent_rate = rate /2 ; + +return rate; +} +static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) {
Signature · 1 line
2.14.1
Re: [PATCH V6 8/8] drm/mediatek: fix the rate of parent for hdmi phy in MT2701
Hi, Wangyan:
Quoted 60 lines · wangyan wang
From: chunhui dai <[email protected]>
We should not change the rate of parent for hdmi phy when doing
round_ratefor this clock. The parent clock of hdmi phy must be the same as it. We change it when doingset_rateonly.Signed-off-by chunhui dai <[email protected]>Signed-off-by wangyan wang <[email protected]>--- drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 14 -------------- drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 3 --- drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 11 +++++++++++ drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 14 ++++++++++++++ 4 files changed, 25 insertions(+), 17 deletions(-)drivers/gpu/drm/mediatek/mtk_hdmi_phy.c +0
-14@@ -15,20 +15,6 @@ static const struct phy_ops mtk_hdmi_phy_dev_ops = { .owner = THIS_MODULE, }; -long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, -unsigned long *parent_rate) -{ -struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); - - hdmi_phy->pll_rate = rate; -if (rate <=74250000 ) - *parent_rate = rate; -else - *parent_rate = rate /2 ; - -return rate; -} -u32 mtk_hdmi_phy_read (struct mtk_hdmi_phy *hdmi_phy,u32 offset) {return readl (hdmi_phy->regs + offset);drivers/gpu/drm/mediatek/mtk_hdmi_phy.h +0
-3@@ -50,9 +50,6 @@ void mtk_hdmi_phy_set_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,void mtk_hdmi_phy_mask (struct mtk_hdmi_phy *hdmi_phy,u32 offset,u32 val,u32 mask);struct mtk_hdmi_phy *to_mtk_hdmi_phy (struct clk_hw *hw); -long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, -unsigned long *parent_rate); -extern struct platform_driver mtk_hdmi_phy_driver;extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf;extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_2701_conf;drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +0
-0
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, · line 161
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +7
-0@@ -152,6 +152,17 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, RG_HDMITX_DRV_IBIAS_MASK);return 0 ; } + +static long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, +unsigned long *parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); + + hdmi_phy->pll_rate = rate;
I think you don't need to save the rate into pll_rate here, pll_rate would be set in set_rate() or recalc_rate().
Regards,
CK
Quoted 32 lines
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +4
-0+ +return rate; +} +static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) {drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c +14
-0@@ -285,6 +285,20 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,return 0 ; } +static long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, +unsigned long *parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); + + hdmi_phy->pll_rate = rate; +if (rate <=74250000 ) + *parent_rate = rate; +else + *parent_rate = rate /2 ; + +return rate; +} +static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) {
Re: [PATCH V6 8/8] drm/mediatek: fix the rate of parent for hdmi phy in MT2701
Hi, Wangyan:
Quoted 68 lines · CK Hu
Hi, Wangyan:
Quoted 65 lines · wangyan wang
From: chunhui dai <[email protected]>
We should not change the rate of parent for hdmi phy when doing
round_ratefor this clock. The parent clock of hdmi phy must be the same as it. We change it when doingset_rateonly.Signed-off-by chunhui dai <[email protected]>Signed-off-by wangyan wang <[email protected]>--- drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 14 -------------- drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 3 --- drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 11 +++++++++++ drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 14 ++++++++++++++ 4 files changed, 25 insertions(+), 17 deletions(-)drivers/gpu/drm/mediatek/mtk_hdmi_phy.c +0
-14@@ -15,20 +15,6 @@ static const struct phy_ops mtk_hdmi_phy_dev_ops = { .owner = THIS_MODULE, }; -long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, -unsigned long *parent_rate) -{ -struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); - - hdmi_phy->pll_rate = rate; -if (rate <=74250000 ) - *parent_rate = rate; -else - *parent_rate = rate /2 ; - -return rate; -} -u32 mtk_hdmi_phy_read (struct mtk_hdmi_phy *hdmi_phy,u32 offset) {return readl (hdmi_phy->regs + offset);drivers/gpu/drm/mediatek/mtk_hdmi_phy.h +0
-3@@ -50,9 +50,6 @@ void mtk_hdmi_phy_set_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,void mtk_hdmi_phy_mask (struct mtk_hdmi_phy *hdmi_phy,u32 offset,u32 val,u32 mask);struct mtk_hdmi_phy *to_mtk_hdmi_phy (struct clk_hw *hw); -long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, -unsigned long *parent_rate); -extern struct platform_driver mtk_hdmi_phy_driver;extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf;extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_2701_conf;drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +2
-0@@ -152,6 +152,17 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, RG_HDMITX_DRV_IBIAS_MASK);return 0 ; } + +static long mtk_hdmi_pll_round_rate(struct clk_hw *hw, unsigned long rate,
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, · line 161
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +5
-0+ unsigned long *parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); + + hdmi_phy->pll_rate = rate;I think you don't need to save the rate into
pll_ratehere,pll_ratewould be set inset_rate()orrecalc_rate().
As offline discuss, you mention that this function just need to return current rate. I think you could just remove this line 'hdmi_phy->pll_rate = rate;' and return rate only. You don't need to assign hdmi_phy->pll_rate here because it would be set later in set_rate().
Regards,
CK
Quoted 37 lines
Regards,
CKQuoted 32 lines
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +4
-0+ +return rate; +} +static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) {drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c +14
-0@@ -285,6 +285,20 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,return 0 ; } +static long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, +unsigned long *parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); + + hdmi_phy->pll_rate = rate; +if (rate <=74250000 ) + *parent_rate = rate; +else + *parent_rate = rate /2 ; + +return rate; +} +static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) {
Re: [PATCH V6 8/8] drm/mediatek: fix the rate of parent for hdmi phy in MT2701
Hi, Wangyan:
Quoted 80 lines · CK Hu
Hi, Wangyan:
Quoted 68 lines · CK Hu
Hi, Wangyan:
Quoted 65 lines · wangyan wang
From: chunhui dai <[email protected]>
We should not change the rate of parent for hdmi phy when doing
round_ratefor this clock. The parent clock of hdmi phy must be the same as it. We change it when doingset_rateonly.Signed-off-by chunhui dai <[email protected]>Signed-off-by wangyan wang <[email protected]>--- drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 14 -------------- drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 3 --- drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 11 +++++++++++ drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 14 ++++++++++++++ 4 files changed, 25 insertions(+), 17 deletions(-)drivers/gpu/drm/mediatek/mtk_hdmi_phy.c +0
-14@@ -15,20 +15,6 @@ static const struct phy_ops mtk_hdmi_phy_dev_ops = { .owner = THIS_MODULE, }; -long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, -unsigned long *parent_rate) -{ -struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); - - hdmi_phy->pll_rate = rate; -if (rate <=74250000 ) - *parent_rate = rate; -else - *parent_rate = rate /2 ; - -return rate; -} -u32 mtk_hdmi_phy_read (struct mtk_hdmi_phy *hdmi_phy,u32 offset) {return readl (hdmi_phy->regs + offset);drivers/gpu/drm/mediatek/mtk_hdmi_phy.h +0
-3@@ -50,9 +50,6 @@ void mtk_hdmi_phy_set_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,void mtk_hdmi_phy_mask (struct mtk_hdmi_phy *hdmi_phy,u32 offset,u32 val,u32 mask);struct mtk_hdmi_phy *to_mtk_hdmi_phy (struct clk_hw *hw); -long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, -unsigned long *parent_rate); -extern struct platform_driver mtk_hdmi_phy_driver;extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf;extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_2701_conf;drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +2
-0@@ -152,6 +152,17 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, RG_HDMITX_DRV_IBIAS_MASK);return 0 ; } + +static long mtk_hdmi_pll_round_rate(struct clk_hw *hw, unsigned long rate,Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, · line 161
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +5
-0+ unsigned long *parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); + + hdmi_phy->pll_rate = rate;I think you don't need to save the rate into
pll_ratehere,pll_ratewould be set inset_rate()orrecalc_rate().
Quoted 5 lines
As offline discuss, you mention that this function just need to return current rate. I think you could just remove this line '
hdmi_phy->pll_rate= rate;' and return rate only. You don't need to assignhdmi_phy->pll_ratehere because it would be set later inset_rate().
If you do not do any thing in mtk_hdmi_pll_round_rate(), I think you could just don't implement round_rate() callback function because ccf would not call round_rate() if it is not implemented.
Regards,
CK
Quoted 42 lines
Regards,
CKQuoted 37 lines
Regards,
CKQuoted 32 lines
drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +4
-0+ +return rate; +} +static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) {drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c +14
-0@@ -285,6 +285,20 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,return 0 ; } +static long mtk_hdmi_pll_round_rate (struct clk_hw *hw,unsigned long rate, +unsigned long *parent_rate) +{ +struct mtk_hdmi_phy *hdmi_phy =to_mtk_hdmi_phy (hw); + + hdmi_phy->pll_rate = rate; +if (rate <=74250000 ) + *parent_rate = rate; +else + *parent_rate = rate /2 ; + +return rate; +} +static unsigned long mtk_hdmi_pll_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) {
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 7 lines · wangyan wang
From: Wangyan Wang <[email protected]>
V6 adopt maintainer's suggestion.
Here is the change list between V5 & V6
1. change "unsigned charmux_flags;" to "u8mux_flags;" to match with the struct in " clk: mediatek: addMUX_GATE_FLAGS_2".
Hi, Wangyan:
I'm not familiar with this clock system, so I still have some question about it, if you could describe more clear, it would help us to speed up this review process.
In [1], I find the clock that dpi and hdmi_phy controls,
dpi0: dpi@14014000 {
clocks = <&mmsys CLK_MM_DPI1_DIGL>,
<&mmsys CLK_MM_DPI1_ENGINE>,
<&topckgen CLK_TOP_TVDPLL>;
clock-names = "pixel", "engine", "pll";
};
hdmi_phy: phy@10209100 {
clocks = <&apmixedsys CLK_APMIXED_HDMI_REF>;
clock-names = "pll_ref";
};In [2], You say that to prevent changing tvdpll would let hdmi stable, and this clock is controlled by dpi, why do you modify the control flow in hdmi_phy? If these two have relationship, please describe more clear because I'm not familiar with this clock system.
And I think that patch 'drm/mediatek: using new factor for tvdpll in MT2701' is the major patch to prevent modifying tvdpll because it reduce the factor case. Does MT8173 has the same problem? Just ask, I does not require you to modify MT8173 part.
[1]
https://github.com/frank-w/BPI-R2-4.14/blob/663f7def421952eb49b2d698eadaff12d02622d2/arch/arm/boot/dts/mt7623.dtsi
[2]
http://lists.infradead.org/pipermail/linux-mediatek/2019-February/017693.html
Regards,
CK
Quoted 22 lines
chunhui dai (8):
drm/mediatek: recalculate hdmi phy clock of MT2701 by querying
hardware
drm/mediatek: move the setting of fixed divider drm/mediatek: using different flags of clk for HDMI phy drm/mediatek: fix the rate and divder of hdmi phy for MT2701
clk: mediatek: addMUX_GATE_FLAGS_2
clk: mediatek: usingCLK_MUX_ROUND_CLOSESTfor the clock ofdpi1_seldrm/mediatek: using new factor for tvdpll in MT2701 drm/mediatek: fix the rate of parent for hdmi phy in MT2701drivers/clk/mediatek/clk-mt2701.c | 4 +- drivers/clk/mediatek/clk-mtk.c | 2 +- drivers/clk/mediatek/clk-mtk.h | 20 ++++++--- drivers/gpu/drm/mediatek/mtk_dpi.c | 8 ++-- drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 34 ++++------------ drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 7 +--- drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 56 +++++++++++++++++++++++--- drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 23 +++++++++++ 8 files changed, 102 insertions(+), 52 deletions(-)
Hi, Wangyan:
Quoted 30 lines · CK Hu
Quoted 7 lines · wangyan wang
From: Wangyan Wang <[email protected]>
V6 adopt maintainer's suggestion.
Here is the change list between V5 & V6
1. change "unsigned charmux_flags;" to "u8mux_flags;" to match with the struct in " clk: mediatek: addMUX_GATE_FLAGS_2".Hi, Wangyan:
I'm not familiar with this clock system, so I still have some question about it, if you could describe more clear, it would help us to speed up this review process.
In [1], I find the clock that dpi and
hdmi_phycontrols,dpi0: dpi@14014000 { clocks = <&mmsys CLK_MM_DPI1_DIGL>, <&mmsys CLK_MM_DPI1_ENGINE>, <&topckgen CLK_TOP_TVDPLL>; clock-names = "pixel", "engine", "pll"; }; hdmi_phy: phy@10209100 { clocks = <&apmixedsys CLK_APMIXED_HDMI_REF>; clock-names = "pll_ref"; };
Quoted 5 lines
In [2], You say that to prevent changing tvdpll would let hdmi stable, and this clock is controlled by dpi, why do you modify the control flow in
hdmi_phy? If these two have relationship, please describe more clear because I'm not familiar with this clock system.
As discuss offline, in [3] we can find out that CLK_APMIXED_HDMI_REF is derived from tvdpll, so tvdpll is the parent clock of hdmi_phy_pll. Therefore, this series should modify hdmi_phy flow as well.
Regards,
CK
Quoted 37 lines
And I think that patch 'drm/mediatek: using new factor for tvdpll in MT2701' is the major patch to prevent modifying tvdpll because it reduce the factor case. Does MT8173 has the same problem? Just ask, I does not require you to modify MT8173 part.
[1]
https://github.com/frank-w/BPI-R2-4.14/blob/663f7def421952eb49b2d698eadaff12d02622d2/arch/arm/boot/dts/mt7623.dtsi
[2]
http://lists.infradead.org/pipermail/linux-mediatek/2019-February/017693.htmlRegards,
CKQuoted 22 lines
chunhui dai (8):
drm/mediatek: recalculate hdmi phy clock of MT2701 by querying
hardware
drm/mediatek: move the setting of fixed divider drm/mediatek: using different flags of clk for HDMI phy drm/mediatek: fix the rate and divder of hdmi phy for MT2701
clk: mediatek: addMUX_GATE_FLAGS_2
clk: mediatek: usingCLK_MUX_ROUND_CLOSESTfor the clock ofdpi1_seldrm/mediatek: using new factor for tvdpll in MT2701 drm/mediatek: fix the rate of parent for hdmi phy in MT2701drivers/clk/mediatek/clk-mt2701.c | 4 +- drivers/clk/mediatek/clk-mtk.c | 2 +- drivers/clk/mediatek/clk-mtk.h | 20 ++++++--- drivers/gpu/drm/mediatek/mtk_dpi.c | 8 ++-- drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 34 ++++------------ drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 7 +--- drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 56 +++++++++++++++++++++++--- drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 23 +++++++++++ 8 files changed, 102 insertions(+), 52 deletions(-)