drm: bridge: dw-hdmi: Add hook for resume
Subsystems (5)
PATCH v2 1/2 drm: bridge: dw-hdmi: Add hook for resume
On Rockchip rk3288-based Chromebooks when you do a suspend/resume cycle:
1. You lose the ability to detect an HDMI device being plugged in.
2. If you're using the i2c bus built in to dw_hdmi then it stops working.
Let's add a hook to the core dw-hdmi driver so that we can call it in dw_hdmi-rockchip in the next commit.
NOTE: the exact set of steps I've done here in resume come from looking at the normal dw_hdmi init sequence in upstream Linux plus the sequence that we did in downstream Chrome OS 3.14. Testing show that it seems to work, but if an extra step is needed or something here is not needed we could improve it.
As part of this change we'll refactor the hardware init bits of dw-hdmi to happen all in one function and all at the same time. Since we need to init the interrupt mutes before we request the IRQ, this means moving the hardware init earlier in the function, but there should be no problems with that. Also as part of this we now unconditionally init the "i2c" parts of dw-hdmi, but again that ought to be fine.
---
Changes in v2:
- No empty stub for suspend (Laurent)
- Refactor to use the same code in probe and resume (Laurent)
- Unconditionally init i2c (seems OK + needed before hdmi->i2c init)
- Combine "init" of i2c and "setup" of i2c (no reason to split)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 50 ++++++++++++++--------- include/drm/bridge/dw_hdmi.h | 2 + 2 files changed, 33 insertions(+), 19 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +31 -19
@@ -227,6 +227,13 @@ static void hdmi_mask_writeb(struct dw_hdmi *hdmi, u8 data, unsigned int reg,static void dw_hdmi_i2c_init (struct dw_hdmi *hdmi) { +hdmi_writeb (hdmi,HDMI_PHY_I2CM_INT_ADDR_DONE_POL , +HDMI_PHY_I2CM_INT_ADDR ); + +hdmi_writeb (hdmi,HDMI_PHY_I2CM_CTLINT_ADDR_NAC_POL | +HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_POL , +HDMI_PHY_I2CM_CTLINT_ADDR ); +/* Software reset */ hdmi_writeb (hdmi,0x00 ,HDMI_I2CM_SOFTRSTZ );
@@ -1925,16 +1932,6 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode)return 0 ; } -static void dw_hdmi_setup_i2c (struct dw_hdmi *hdmi) -{ -hdmi_writeb (hdmi,HDMI_PHY_I2CM_INT_ADDR_DONE_POL , -HDMI_PHY_I2CM_INT_ADDR ); - -hdmi_writeb (hdmi,HDMI_PHY_I2CM_CTLINT_ADDR_NAC_POL | -HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_POL , -HDMI_PHY_I2CM_CTLINT_ADDR ); -} -static void initialize_hdmi_ih_mutes (struct dw_hdmi *hdmi) {u8 ih_mute;
@@ -2435,6 +2432,21 @@ static const struct regmap_config hdmi_regmap_32bit_config = { .max_register = HDMI_I2CM_FS_SCL_LCNT_0_ADDR << 2, }; +static void dw_hdmi_init_hw (struct dw_hdmi *hdmi) +{ +initialize_hdmi_ih_mutes (hdmi); + +/* +* Reset HDMI DDC I2C master controller and mute I2CM interrupts. +* Even if we are using a separate i2c adapter doing this doesn't +* hurt. +*/ +dw_hdmi_i2c_init (hdmi); + +if (hdmi->phy.ops->setup_hpd) + hdmi->phy.ops->setup_hpd (hdmi, hdmi->phy.data); +} +static struct dw_hdmi *__dw_hdmi_probe (struct platform_device *pdev,const struct dw_hdmi_plat_data *plat_data)
@@ -2586,7 +2598,7 @@ __dw_hdmi_probe(struct platform_device *pdev, prod_id1 &HDMI_PRODUCT_ID1_HDCP ?"with" :"without" , hdmi->phy.name); -initialize_hdmi_ih_mutes (hdmi); +dw_hdmi_init_hw (hdmi); irq =platform_get_irq (pdev,0 );if (irq <0 ) {
@@ -2625,10 +2637,6 @@ __dw_hdmi_probe(struct platform_device *pdev, hdmi->bridge.of_node = pdev->dev.of_node;#endif -dw_hdmi_setup_i2c (hdmi); -if (hdmi->phy.ops->setup_hpd) - hdmi->phy.ops->setup_hpd (hdmi, hdmi->phy.data); -memset (&pdevinfo,0 ,sizeof (pdevinfo)); pdevinfo.parent = dev; pdevinfo.id =PLATFORM_DEVID_AUTO ;
@@ -2681,10 +2689,6 @@ __dw_hdmi_probe(struct platform_device *pdev, hdmi->cec =platform_device_register_full (&pdevinfo); } -/* Reset HDMI DDC I2C master controller and mute I2CM interrupts */ -if (hdmi->i2c) -dw_hdmi_i2c_init (hdmi); -return hdmi; err_iahb:
@@ -2788,6 +2792,14 @@ void dw_hdmi_unbind(struct dw_hdmi *hdmi) }EXPORT_SYMBOL_GPL (dw_hdmi_unbind); +int dw_hdmi_resume (struct dw_hdmi *hdmi) +{ +dw_hdmi_init_hw (hdmi); + +return 0 ; +} +EXPORT_SYMBOL_GPL (dw_hdmi_resume); +MODULE_AUTHOR ("Sascha Hauer <[email protected]>" );MODULE_AUTHOR ("Andy Yan <[email protected]>" );MODULE_AUTHOR ("Yakir Yang <[email protected]>" );
include/drm/bridge/dw_hdmi.h +2 -0
@@ -154,6 +154,8 @@ struct dw_hdmi *dw_hdmi_bind(struct platform_device *pdev,struct drm_encoder *encoder, const struct dw_hdmi_plat_data *plat_data); +int dw_hdmi_resume (struct dw_hdmi *hdmi); +void dw_hdmi_setup_rx_sense (struct dw_hdmi *hdmi,bool hpd,bool rx_sense);void dw_hdmi_set_sample_rate (struct dw_hdmi *hdmi,unsigned int rate);
Signature · 1 line
2.21.0.1020.gf2820cf01a-goog
PATCH v2 2/2 drm/rockchip: dw_hdmi: Handle suspend/resume
On Rockchip rk3288-based Chromebooks when you do a suspend/resume cycle:
1. You lose the ability to detect an HDMI device being plugged in.
2. If you're using the i2c bus built in to dw_hdmi then it stops working.
Let's call the core dw-hdmi's suspend/resume functions to restore things.
NOTE: in downstream Chrome OS (based on kernel 3.14) we used the "late/early" versions of suspend/resume because we found that the VOP was sometimes resuming before dw_hdmi and then calling into us before we were fully resumed. For now I have gone back to the normal suspend/resume because I can't reproduce the problems.
---
Changes in v2:
- Add forgotten static (Laurent)
- No empty stub for suspend (Laurent)
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +12 -0
@@ -542,11 +542,23 @@ static int dw_hdmi_rockchip_remove(struct platform_device *pdev)return 0 ; } +static int __maybe_unused dw_hdmi_rockchip_resume (struct device *dev) +{ +struct rockchip_hdmi *hdmi =dev_get_drvdata (dev); + +return dw_hdmi_resume (hdmi->hdmi); +} + +static const struct dev_pm_ops dw_hdmi_rockchip_pm = { +SET_SYSTEM_SLEEP_PM_OPS (NULL , dw_hdmi_rockchip_resume) +}; +struct platform_driver dw_hdmi_rockchip_pltfm_driver = { .probe = dw_hdmi_rockchip_probe, .remove = dw_hdmi_rockchip_remove, .driver = { .name ="dwhdmi-rockchip" , + .pm = &dw_hdmi_rockchip_pm, .of_match_table = dw_hdmi_rockchip_dt_ids, }, };
Signature · 1 line
2.21.0.1020.gf2820cf01a-goog
Re: [PATCH v2 2/2] drm/rockchip: dw_hdmi: Handle suspend/resume
Hi,
Quoted 19 lines · Douglas Anderson
On Rockchip rk3288-based Chromebooks when you do a suspend/resume cycle:
1. You lose the ability to detect an HDMI device being plugged in.
2. If you're using the i2c bus built in to
dw_hdmithen it stops working.Let's call the core dw-hdmi's suspend/resume functions to restore things.
NOTE: in downstream Chrome OS (based on kernel 3.14) we used the "late/early" versions of suspend/resume because we found that the VOP was sometimes resuming before
dw_hdmiand then calling into us before we were fully resumed. For now I have gone back to the normal suspend/resume because I can't reproduce the problems.Signed-off-by Douglas Anderson <[email protected]>
Quoted 8 lines
---
Changes in v2:
- Add forgotten static (Laurent)
- No empty stub for suspend (Laurent)drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
Whoops, forgot that I should have carried forward:
-Doug
Laurent,
Quoted 26 lines · Douglas Anderson
On Rockchip rk3288-based Chromebooks when you do a suspend/resume cycle:
1. You lose the ability to detect an HDMI device being plugged in.
2. If you're using the i2c bus built in to
dw_hdmithen it stops working.Let's add a hook to the core dw-hdmi driver so that we can call it in dw_hdmi-rockchip in the next commit.
NOTE: the exact set of steps I've done here in resume come from looking at the normal
dw_hdmiinit sequence in upstream Linux plus the sequence that we did in downstream Chrome OS 3.14. Testing show that it seems to work, but if an extra step is needed or something here is not needed we could improve it.As part of this change we'll refactor the hardware init bits of dw-hdmi to happen all in one function and all at the same time. Since we need to init the interrupt mutes before we request the IRQ, this means moving the hardware init earlier in the function, but there should be no problems with that. Also as part of this we now unconditionally init the "i2c" parts of dw-hdmi, but again that ought to be fine.
Quoted 8 lines
Signed-off-by Douglas Anderson <[email protected]>---
Changes in v2:
- No empty stub for suspend (Laurent)
- Refactor to use the same code in probe and resume (Laurent)
- Unconditionally init i2c (seems OK + needed beforehdmi->i2cinit)
- Combine "init" of i2c and "setup" of i2c (no reason to split)
Are you happy with this now? Even if you feel like you don't want to give it a full Reviewed-by, it'd good if you could confirm that I handled your suggestions properly.
Thanks! :-)
-Doug
Hi Douglas,
Thank you for the patch.
Quoted 127 lines · Douglas Anderson
On Rockchip rk3288-based Chromebooks when you do a suspend/resume cycle:
1. You lose the ability to detect an HDMI device being plugged in.
2. If you're using the i2c bus built in to
dw_hdmithen it stops working.Let's add a hook to the core dw-hdmi driver so that we can call it in dw_hdmi-rockchip in the next commit.
NOTE: the exact set of steps I've done here in resume come from looking at the normal
dw_hdmiinit sequence in upstream Linux plus the sequence that we did in downstream Chrome OS 3.14. Testing show that it seems to work, but if an extra step is needed or something here is not needed we could improve it.As part of this change we'll refactor the hardware init bits of dw-hdmi to happen all in one function and all at the same time. Since we need to init the interrupt mutes before we request the IRQ, this means moving the hardware init earlier in the function, but there should be no problems with that. Also as part of this we now unconditionally init the "i2c" parts of dw-hdmi, but again that ought to be fine.
Signed-off-by Douglas Anderson <[email protected]>---
Changes in v2:
- No empty stub for suspend (Laurent)
- Refactor to use the same code in probe and resume (Laurent)
- Unconditionally init i2c (seems OK + needed beforehdmi->i2cinit)
- Combine "init" of i2c and "setup" of i2c (no reason to split)drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 50 ++++++++++++++--------- include/drm/bridge/dw_hdmi.h | 2 + 2 files changed, 33 insertions(+), 19 deletions(-)drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +23
-19@@ -227,6 +227,13 @@ static void hdmi_mask_writeb(struct dw_hdmi *hdmi, u8 data, unsigned int reg,static void dw_hdmi_i2c_init (struct dw_hdmi *hdmi) { +hdmi_writeb (hdmi,HDMI_PHY_I2CM_INT_ADDR_DONE_POL , +HDMI_PHY_I2CM_INT_ADDR ); + +hdmi_writeb (hdmi,HDMI_PHY_I2CM_CTLINT_ADDR_NAC_POL | +HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_POL , +HDMI_PHY_I2CM_CTLINT_ADDR ); +/* Software reset */ hdmi_writeb (hdmi,0x00 ,HDMI_I2CM_SOFTRSTZ );@@ -1925,16 +1932,6 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode)return 0 ; } -static void dw_hdmi_setup_i2c (struct dw_hdmi *hdmi) -{ -hdmi_writeb (hdmi,HDMI_PHY_I2CM_INT_ADDR_DONE_POL , -HDMI_PHY_I2CM_INT_ADDR ); - -hdmi_writeb (hdmi,HDMI_PHY_I2CM_CTLINT_ADDR_NAC_POL | -HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_POL , -HDMI_PHY_I2CM_CTLINT_ADDR ); -} -static void initialize_hdmi_ih_mutes (struct dw_hdmi *hdmi) {u8 ih_mute;@@ -2435,6 +2432,21 @@ static const struct regmap_config hdmi_regmap_32bit_config = { .max_register = HDMI_I2CM_FS_SCL_LCNT_0_ADDR << 2, }; +static void dw_hdmi_init_hw (struct dw_hdmi *hdmi) +{ +initialize_hdmi_ih_mutes (hdmi); + +/* +* Reset HDMI DDC I2C master controller and mute I2CM interrupts. +* Even if we are using a separate i2c adapter doing this doesn't +* hurt. +*/ +dw_hdmi_i2c_init (hdmi); + +if (hdmi->phy.ops->setup_hpd) + hdmi->phy.ops->setup_hpd (hdmi, hdmi->phy.data); +} +static struct dw_hdmi *__dw_hdmi_probe (struct platform_device *pdev,const struct dw_hdmi_plat_data *plat_data)@@ -2586,7 +2598,7 @@ __dw_hdmi_probe(struct platform_device *pdev, prod_id1 &HDMI_PRODUCT_ID1_HDCP ?"with" :"without" , hdmi->phy.name); -initialize_hdmi_ih_mutes (hdmi); +dw_hdmi_init_hw (hdmi); irq =platform_get_irq (pdev,0 );if (irq <0 ) {@@ -2625,10 +2637,6 @@ __dw_hdmi_probe(struct platform_device *pdev, hdmi->bridge.of_node = pdev->dev.of_node;#endif -dw_hdmi_setup_i2c (hdmi); -if (hdmi->phy.ops->setup_hpd) - hdmi->phy.ops->setup_hpd (hdmi, hdmi->phy.data); -memset (&pdevinfo,0 ,sizeof (pdevinfo)); pdevinfo.parent = dev; pdevinfo.id =PLATFORM_DEVID_AUTO ;@@ -2681,10 +2689,6 @@ __dw_hdmi_probe(struct platform_device *pdev, hdmi->cec =platform_device_register_full (&pdevinfo); } -/* Reset HDMI DDC I2C master controller and mute I2CM interrupts */ -if (hdmi->i2c) -dw_hdmi_i2c_init (hdmi); -return hdmi; err_iahb:
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c void dw_hdmi_unbind(struct dw_hdmi *hdmi) · line 2800
Quoted 9 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +6
-0@@ -2788,6 +2792,14 @@ void dw_hdmi_unbind(struct dw_hdmi *hdmi) }EXPORT_SYMBOL_GPL (dw_hdmi_unbind); +int dw_hdmi_resume (struct dw_hdmi *hdmi) +{ +dw_hdmi_init_hw (hdmi); + +return 0 ; +}
If the function always returns 0 I would make it void. Apart from that,
Quoted 18 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +2
-0+EXPORT_SYMBOL_GPL (dw_hdmi_resume); +MODULE_AUTHOR ("Sascha Hauer <[email protected]>" );MODULE_AUTHOR ("Andy Yan <[email protected]>" );MODULE_AUTHOR ("Yakir Yang <[email protected]>" );include/drm/bridge/dw_hdmi.h +2
-0@@ -154,6 +154,8 @@ struct dw_hdmi *dw_hdmi_bind(struct platform_device *pdev,struct drm_encoder *encoder, const struct dw_hdmi_plat_data *plat_data); +int dw_hdmi_resume (struct dw_hdmi *hdmi); +void dw_hdmi_setup_rx_sense (struct dw_hdmi *hdmi,bool hpd,bool rx_sense);void dw_hdmi_set_sample_rate (struct dw_hdmi *hdmi,unsigned int rate);
Signature · 3 lines
Regards, Laurent Pinchart