drm: bridge/dw_hdmi: fixed codec style
Subsystems (6)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 1/3 drm: bridge/dw_hdmi: fixed codec style
- const struct dw_hdmi_mpll_config *mpll_config =
- hdmi->plat_data->mpll_cfg;
- const struct dw_hdmi_curr_ctrl *curr_ctrl = hdmi->plat_data->cur_ctr;
- const struct dw_hdmi_sym_term *sym_term = hdmi->plat_data->sym_term;
+ const struct dw_hdmi_plat_data *plat_data = hdmi->plat_data;
+ const struct dw_hdmi_mpll_config *mpll_config = plat_data->mpll_cfg;
+ const struct dw_hdmi_curr_ctrl *curr_ctrl = plat_data->cur_ctr;
+ const struct dw_hdmi_sym_term *sym_term = plat_data->sym_term;
---
Changes in v2: None
drivers/gpu/drm/bridge/dw_hdmi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/bridge/dw_hdmi.c +4 -4
@@ -900,10 +900,10 @@ static int hdmi_phy_configure(struct dw_hdmi *hdmi, unsigned char prep, {unsigned res_idx, i;u8 val, msec; -const struct dw_hdmi_mpll_config *mpll_config = - hdmi->plat_data->mpll_cfg; -const struct dw_hdmi_curr_ctrl *curr_ctrl = hdmi->plat_data->cur_ctr; -const struct dw_hdmi_sym_term *sym_term = hdmi->plat_data->sym_term; +const struct dw_hdmi_plat_data *plat_data = hdmi->plat_data; +const struct dw_hdmi_mpll_config *mpll_config = plat_data->mpll_cfg; +const struct dw_hdmi_curr_ctrl *curr_ctrl = plat_data->cur_ctr; +const struct dw_hdmi_sym_term *sym_term = plat_data->sym_term;if (prep)return -EINVAL ;
Signature · 1 line
2.1.2
drivers/gpu/drm/bridge/dw_hdmi.c
Quoted 1 line · Yakir Yang
drivers/gpu/drm/bridge/dw_hdmi.c +0
-0
[]
Quoted 5 lines
drivers/gpu/drm/bridge/dw_hdmi.c +0
-1@@ -900,10 +900,10 @@ static int hdmi_phy_configure(struct dw_hdmi *hdmi, unsigned char prep, {unsigned res_idx, i;u8 val, msec; - const struct dw_hdmi_mpll_config *mpll_config =
drivers/gpu/drm/bridge/dw_hdmi.c static int hdmi_phy_configure(struct dw_hdmi *hdmi, unsigned char prep, · line 909
Quoted 10 lines
drivers/gpu/drm/bridge/dw_hdmi.c +4
-3- hdmi->plat_data->mpll_cfg; -const struct dw_hdmi_curr_ctrl *curr_ctrl = hdmi->plat_data->cur_ctr; -const struct dw_hdmi_sym_term *sym_term = hdmi->plat_data->sym_term; +const struct dw_hdmi_plat_data *plat_data = hdmi->plat_data; +const struct dw_hdmi_mpll_config *mpll_config = plat_data->mpll_cfg; +const struct dw_hdmi_curr_ctrl *curr_ctrl = plat_data->cur_ctr; +const struct dw_hdmi_sym_term *sym_term = plat_data->sym_term;if (prep)return -EINVAL ;
Shouldn't all of these be static?
Quoted 1 line · Joe Perches
Shouldn't all of these be static?
Don't mind me. These shouldn't be static.
I was a bit mislead by the commit message.
I think it'd be better not to put patch-like
+ and - lines in the commit description.
cheers, Joe
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 13 lines · Joe Perches
Quoted 1 line · Joe Perches
Shouldn't all of these be static?
Don't mind me. These shouldn't be static.
I was a bit mislead by the commit message.
I think it'd be better not to put patch-like
+ and - lines in the commit description.cheers, Joe
Okay, I will delete it from commit message.
Thanks for reply :)
Quoted 1 line
Quoted 11 lines · Yakir Yang
- const struct
dw_hdmi_mpll_config*mpll_config=
-hdmi->plat_data->mpll_cfg;
- const structdw_hdmi_curr_ctrl*curr_ctrl=hdmi->plat_data->cur_ctr;
- const structdw_hdmi_sym_term*sym_term=hdmi->plat_data->sym_term;+ const struct
dw_hdmi_plat_data*plat_data=hdmi->plat_data;
+ const structdw_hdmi_mpll_config*mpll_config=plat_data->mpll_cfg;
+ const structdw_hdmi_curr_ctrl*curr_ctrl=plat_data->cur_ctr;
+ const structdw_hdmi_sym_term*sym_term=plat_data->sym_term;Signed-off-by Yakir Yang <[email protected]>
I agree with Joe Perches that this commit message is not very clear. It should summarize what the patches is doing and why, not just be a copy of the change.
e.g., "Using a local struct pointer to reduce one level of indirection makes the code slightly more readable."
, but otherwise this is:
Quoted 31 lines
---
Changes in v2: None
drivers/gpu/drm/bridge/dw_hdmi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/bridge/dw_hdmi.c +4
-5@@ -900,10 +900,10 @@ static int hdmi_phy_configure(struct dw_hdmi *hdmi, unsigned char prep, {unsigned res_idx, i;u8 val, msec; -const struct dw_hdmi_mpll_config *mpll_config = - hdmi->plat_data->mpll_cfg; -const struct dw_hdmi_curr_ctrl *curr_ctrl = hdmi->plat_data->cur_ctr; -const struct dw_hdmi_sym_term *sym_term = hdmi->plat_data->sym_term; +const struct dw_hdmi_plat_data *plat_data = hdmi->plat_data; +const struct dw_hdmi_mpll_config *mpll_config = plat_data->mpll_cfg; +const struct dw_hdmi_curr_ctrl *curr_ctrl = plat_data->cur_ctr; +const struct dw_hdmi_sym_term *sym_term = plat_data->sym_term;if (prep)return -EINVAL ; --2.1.2
Quoted 4 lines
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 12 lines · Daniel Kurtz
Quoted 11 lines · Yakir Yang
- const struct
dw_hdmi_mpll_config*mpll_config=
-hdmi->plat_data->mpll_cfg;
- const structdw_hdmi_curr_ctrl*curr_ctrl=hdmi->plat_data->cur_ctr;
- const structdw_hdmi_sym_term*sym_term=hdmi->plat_data->sym_term;+ const struct
dw_hdmi_plat_data*plat_data=hdmi->plat_data;
+ const structdw_hdmi_mpll_config*mpll_config=plat_data->mpll_cfg;
+ const structdw_hdmi_curr_ctrl*curr_ctrl=plat_data->cur_ctr;
+ const structdw_hdmi_sym_term*sym_term=plat_data->sym_term;Signed-off-by Yakir Yang <[email protected]>
Quoted 8 lines
I agree with Joe Perches that this commit message is not very clear. It should summarize what the patches is doing and why, not just be a copy of the change.
e.g., "Using a local struct pointer to reduce one level of indirection makes the code slightly more readable.", but otherwise this is:
Reviewed-by Daniel Kurtz <[email protected]>
Okay, I will correct it now.
Thanks for your reivew :)
Quoted 37 lines
Quoted 35 lines
---
Changes in v2: None
drivers/gpu/drm/bridge/dw_hdmi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/bridge/dw_hdmi.c +4
-5@@ -900,10 +900,10 @@ static int hdmi_phy_configure(struct dw_hdmi *hdmi, unsigned char prep, {unsigned res_idx, i;u8 val, msec; -const struct dw_hdmi_mpll_config *mpll_config = - hdmi->plat_data->mpll_cfg; -const struct dw_hdmi_curr_ctrl *curr_ctrl = hdmi->plat_data->cur_ctr; -const struct dw_hdmi_sym_term *sym_term = hdmi->plat_data->sym_term; +const struct dw_hdmi_plat_data *plat_data = hdmi->plat_data; +const struct dw_hdmi_mpll_config *mpll_config = plat_data->mpll_cfg; +const struct dw_hdmi_curr_ctrl *curr_ctrl = plat_data->cur_ctr; +const struct dw_hdmi_sym_term *sym_term = plat_data->sym_term;if (prep)return -EINVAL ; --2.1.2
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v2 2/3 drm: bridge/dw_hdmi_rockchip: improve hdmi eye-diagram test
In reply to a message not in the archiveAs for 1920x1080 display resolution, we should turn on the Transmitter Trailer-B.
---
Changes in v2:
- Set slopeboost back to 10%-20%, then rasing/falling time would pass.
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +1 -1
@@ -142,7 +142,7 @@ static const struct dw_hdmi_curr_ctrl rockchip_cur_ctr[] = {static const struct dw_hdmi_sym_term rockchip_sym_term[] = {/*pixelclk symbol term*/ {74250000 ,0x8009 ,0x0004 }, - {148500000 ,0x8029 ,0x0004 }, + {148500000 ,0x802b ,0x0004 }, {297000000 ,0x8039 ,0x0005 }, { ~0UL ,0x0000 ,0x0000 } };
Signature · 1 line
2.1.2
PATCH v2 3/3 drm: bridge/dw_hdmi: improve hdmi single-end test
In reply to a message not in the archiveBecause of iMX6 & Rockchip have differnet mpll config parameter, than the cklvl & txlvl would be different, we also should seperate this parmeter.
As for Rockchip HDMI, when pixle clock less than 148MHz, the cklvl & txlvl should set to 13. When pixel clock less than 74.25MHz the cklvl should set to 18, txlvl should set to 19.
---
Changes in v2:
- For pixel clock less than 74.25MHz, set txlvl to 19 and set cklvl to 18.
drivers/gpu/drm/bridge/dw_hdmi.c | 14 +++++++------- drivers/gpu/drm/imx/dw_hdmi-imx.c | 12 ++++++------ drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 14 +++++++------- include/drm/bridge/dw_hdmi.h | 5 +++-- 4 files changed, 23 insertions(+), 22 deletions(-)
drivers/gpu/drm/bridge/dw_hdmi.c +7 -7
@@ -903,7 +903,7 @@ static int hdmi_phy_configure(struct dw_hdmi *hdmi, unsigned char prep,const struct dw_hdmi_plat_data *plat_data = hdmi->plat_data;const struct dw_hdmi_mpll_config *mpll_config = plat_data->mpll_cfg;const struct dw_hdmi_curr_ctrl *curr_ctrl = plat_data->cur_ctr; -const struct dw_hdmi_sym_term *sym_term = plat_data->sym_term; +const struct dw_hdmi_phy_config *phy_config = plat_data->phy_config;if (prep)return -EINVAL ;
@@ -974,18 +974,18 @@ static int hdmi_phy_configure(struct dw_hdmi *hdmi, unsigned char prep,hdmi_phy_i2c_write (hdmi,0x0000 ,0x13 );/* PLLPHBYCTRL */ hdmi_phy_i2c_write (hdmi,0x0006 ,0x17 ); -for (i =0 ; sym_term[i].mpixelclock != (~0UL ); i++) +for (i =0 ; phy_config[i].mpixelclock != (~0UL ); i++)if (hdmi->hdmi_data.video_mode.mpixelclock <= - sym_term[i].mpixelclock) + phy_config[i].mpixelclock)break ;/* RESISTANCE TERM 133Ohm Cfg */ -hdmi_phy_i2c_write (hdmi, sym_term[i].term,0x19 );/* TXTERM */ +hdmi_phy_i2c_write (hdmi, phy_config[i].term,0x19 );/* TXTERM */ /* PREEMP Cgf 0.00 */ -hdmi_phy_i2c_write (hdmi, sym_term[i].sym_ctr,0x09 );/* CKSYMTXCTRL */ - +hdmi_phy_i2c_write (hdmi, phy_config[i].sym_ctr,0x09 );/* CKSYMTXCTRL */ /* TX/CK LVL 10 */ -hdmi_phy_i2c_write (hdmi,0x01ad ,0x0E );/* VLEVCTRL */ +hdmi_phy_i2c_write (hdmi, phy_config[i].vlev_ctr,0x0E );/* VLEVCTRL */ +/* REMOVE CLK TERM */ hdmi_phy_i2c_write (hdmi,0x8000 ,0x05 );/* CKCALCTRL */
drivers/gpu/drm/imx/dw_hdmi-imx.c +6 -6
@@ -73,10 +73,10 @@ static const struct dw_hdmi_curr_ctrl imx_cur_ctr[] = { } }; -static const struct dw_hdmi_sym_term imx_sym_term[] = { -/*pixelclk symbol term*/ - {148500000 ,0x800d ,0x0005 }, - { ~0UL ,0x0000 ,0x0000 } +static const struct dw_hdmi_phy_config imx_phy_config[] = { +/*pixelclk symbol term vlev */ + {148500000 ,0x800d ,0x0005 ,0x01ad }, + { ~0UL ,0x0000 ,0x0000 ,0x0000 } };static int dw_hdmi_imx_parse_dt (struct imx_hdmi *hdmi)
@@ -139,14 +139,14 @@ static struct drm_encoder_funcs dw_hdmi_imx_encoder_funcs = {static struct dw_hdmi_plat_data imx6q_hdmi_drv_data = { .mpll_cfg = imx_mpll_cfg, .cur_ctr = imx_cur_ctr, - .sym_term = imx_sym_term, + .phy_config = imx_phy_config, .dev_type =IMX6Q_HDMI , };static struct dw_hdmi_plat_data imx6dl_hdmi_drv_data = { .mpll_cfg = imx_mpll_cfg, .cur_ctr = imx_cur_ctr, - .sym_term = imx_sym_term, + .phy_config = imx_phy_config, .dev_type =IMX6DL_HDMI , };
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +7 -7
@@ -139,12 +139,12 @@ static const struct dw_hdmi_curr_ctrl rockchip_cur_ctr[] = { } }; -static const struct dw_hdmi_sym_term rockchip_sym_term[] = { -/*pixelclk symbol term*/ - {74250000 ,0x8009 ,0x0004 }, - {148500000 ,0x802b ,0x0004 }, - {297000000 ,0x8039 ,0x0005 }, - { ~0UL ,0x0000 ,0x0000 } +static const struct dw_hdmi_phy_config rockchip_phy_config[] = { +/*pixelclk symbol term vlev*/ + {74250000 ,0x8009 ,0x0004 ,0x0272 }, + {148500000 ,0x802b ,0x0004 ,0x01ad }, + {297000000 ,0x8039 ,0x0005 ,0x01ad }, + { ~0UL ,0x0000 ,0x0000 ,0x0000 } };static int rockchip_hdmi_parse_dt (struct rockchip_hdmi *hdmi)
@@ -236,7 +236,7 @@ static const struct dw_hdmi_plat_data rockchip_hdmi_drv_data = { .mode_valid = dw_hdmi_rockchip_mode_valid, .mpll_cfg = rockchip_mpll_cfg, .cur_ctr = rockchip_cur_ctr, - .sym_term = rockchip_sym_term, + .phy_config = rockchip_phy_config, .dev_type = RK3288_HDMI, };
include/drm/bridge/dw_hdmi.h +3 -2
@@ -40,10 +40,11 @@ struct dw_hdmi_curr_ctrl {u16 curr[DW_HDMI_RES_MAX ]; }; -struct dw_hdmi_sym_term { +struct dw_hdmi_phy_config {unsigned long mpixelclock;u16 sym_ctr;/*clock symbol and transmitter control*/ u16 term;/*transmission termination value*/ +u16 vlev_ctr;/* voltage level control */ };struct dw_hdmi_audio_data {
@@ -63,7 +64,7 @@ struct dw_hdmi_plat_data {enum dw_hdmi_devtype dev_type;const struct dw_hdmi_mpll_config *mpll_cfg;const struct dw_hdmi_curr_ctrl *cur_ctr; -const struct dw_hdmi_sym_term *sym_term; +const struct dw_hdmi_phy_config *phy_config;enum drm_mode_status (*mode_valid)(struct drm_connector *connector,struct drm_display_mode *mode); };
Signature · 1 line
2.1.2