drm/msm/dp: handle irq_hpd with sink_count = 0 correctly
PATCH v3 1/2 drm/msm/dp: handle irq_hpd with sink_count = 0 correctly
irq_hpd interrupt should be handled after dongle plugged in and before dongle unplugged. Hence irq_hpd interrupt is enabled at the end of the plugin handle and disabled at the beginning of unplugged handle. Current irq_hpd with sink_count = 0 is wrongly handled same as the dongle unplugged which tears down the mainlink and disables the phy. This patch fixes this problem by only tearing down the mainlink but keeping phy enabled at irq_hpd with sink_count = 0 handle so that next irq_hpe with sink_count =1 can be handled by setup mainlink only.
Changes in v2:
-- add ctrl->phy_Power_count
Changes in v3:
-- del ctrl->phy_Power_count
-- add phy_power_off to dp_ctrl_off_link_stream()
--- drivers/gpu/drm/msm/dp/dp_catalog.c | 5 ++-- drivers/gpu/drm/msm/dp/dp_ctrl.c | 54 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 ++ drivers/gpu/drm/msm/dp/dp_display.c | 46 ++++++++++++++++++++++++------- 4 files changed, 94 insertions(+), 13 deletions(-)
drivers/gpu/drm/msm/dp/dp_catalog.c +2 -3
@@ -582,10 +582,9 @@ void dp_catalog_ctrl_hpd_config(struct dp_catalog *dp_catalog)u32 reftimer =dp_read_aux (catalog,REG_DP_DP_HPD_REFTIMER ); -/* enable HPD interrupts */ +/* enable HPD plug and unplug interrupts */ dp_catalog_hpd_config_intr (dp_catalog, -DP_DP_HPD_PLUG_INT_MASK |DP_DP_IRQ_HPD_INT_MASK - |DP_DP_HPD_UNPLUG_INT_MASK |DP_DP_HPD_REPLUG_INT_MASK , true); +DP_DP_HPD_PLUG_INT_MASK |DP_DP_HPD_UNPLUG_INT_MASK , true);/* Configure REFTIMER and enable it */ reftimer |=DP_DP_HPD_REFTIMER_ENABLE ;
drivers/gpu/drm/msm/dp/dp_ctrl.c +54 -0
60 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_ctrl.h +2 -0
@@ -23,6 +23,8 @@ int dp_ctrl_host_init(struct dp_ctrl *dp_ctrl, bool flip, bool reset);void dp_ctrl_host_deinit (struct dp_ctrl *dp_ctrl);int dp_ctrl_on_link (struct dp_ctrl *dp_ctrl);int dp_ctrl_on_stream (struct dp_ctrl *dp_ctrl); +int dp_ctrl_off_link_stream (struct dp_ctrl *dp_ctrl); +void dp_ctrl_off_phy (struct dp_ctrl *dp_ctrl);int dp_ctrl_off (struct dp_ctrl *dp_ctrl);void dp_ctrl_push_idle (struct dp_ctrl *dp_ctrl);void dp_ctrl_isr (struct dp_ctrl *dp_ctrl);
drivers/gpu/drm/msm/dp/dp_display.c +36 -10
82 lines not on this page · raw message
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Quoting Kuogee Hsieh (2021-05-12 16:29:59)
Quoted 8 lines
irq_hpdinterrupt should be handled after dongle plugged in and before dongle unplugged. Henceirq_hpdinterrupt is enabled at the end of the plugin handle and disabled at the beginning of unplugged handle. Currentirq_hpdwithsink_count= 0 is wrongly handled same as the dongle unplugged which tears down the mainlink and disables the phy. This patch fixes this problem by only tearing down the mainlink but keeping phy enabled atirq_hpdwithsink_count= 0 handle so that nextirq_hpewithsink_count=1 can be
s/irq_hpe/irq/hpd/
Quoted 39 lines
handled by setup mainlink only.
Changes in v2:
-- addctrl->phy_Power_countChanges in v3:
-- delctrl->phy_Power_count
-- addphy_power_offtodp_ctrl_off_link_stream()Signed-off-by Kuogee Hsieh <[email protected]>--- drivers/gpu/drm/msm/dp/dp_catalog.c | 5 ++-- drivers/gpu/drm/msm/dp/dp_ctrl.c | 54 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 ++ drivers/gpu/drm/msm/dp/dp_display.c | 46 ++++++++++++++++++++++++------- 4 files changed, 94 insertions(+), 13 deletions(-)drivers/gpu/drm/msm/dp/dp_catalog.c +2
-3@@ -582,10 +582,9 @@ void dp_catalog_ctrl_hpd_config(struct dp_catalog *dp_catalog)u32 reftimer =dp_read_aux (catalog,REG_DP_DP_HPD_REFTIMER ); -/* enable HPD interrupts */ +/* enable HPD plug and unplug interrupts */ dp_catalog_hpd_config_intr (dp_catalog, -DP_DP_HPD_PLUG_INT_MASK |DP_DP_IRQ_HPD_INT_MASK - |DP_DP_HPD_UNPLUG_INT_MASK |DP_DP_HPD_REPLUG_INT_MASK , true); +DP_DP_HPD_PLUG_INT_MASK |DP_DP_HPD_UNPLUG_INT_MASK , true);/* Configure REFTIMER and enable it */ reftimer |=DP_DP_HPD_REFTIMER_ENABLE ;drivers/gpu/drm/msm/dp/dp_ctrl.c +0
-0
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl) · line 1819
Quoted 9 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +6
-0@@ -1811,6 +1811,60 @@ int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl)return ret; } +int dp_ctrl_off_link_stream (struct dp_ctrl *dp_ctrl) +{ +struct dp_ctrl_private *ctrl; +struct dp_io *dp_io; +struct phy *phy; +int ret =0 ;
Please don't assign ret and then reassign it without testing it first.
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl) · line 1821
Quoted 2 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-0+ +if (!dp_ctrl)
Does this ever happen?
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl) · line 1832
Quoted 11 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +11
-0+return -EINVAL ; + + ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); + dp_io = &ctrl->parser->io; + phy = dp_io->phy; + +dp_catalog_ctrl_mainlink_ctrl (ctrl->catalog, false); + + ret =dp_power_clk_enable (ctrl->power,DP_STREAM_PM , false); +if (ret) +DRM_ERROR ("Failed to disable pixel clocks. ret=%d\n" , ret);
Why do we continue instead of returning with a failure?
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl) · line 1836
Quoted 4 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +4
-0+ + ret =dp_power_clk_enable (ctrl->power,DP_CTRL_PM , false); +if (ret) +DRM_ERROR ("Failed to disable link clocks. ret=%d\n" , ret);
Same, why do we continue?
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl) · line 1841
Quoted 5 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +5
-0+ +phy_power_off (phy); +phy_exit (phy); + +/* aux channel down, reinit phy */
So we need to call exit/init to reinitialize the phy? I wonder if there could be some phy_reinit() function that combines those.
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl) · line 1845
Quoted 4 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +4
-0+phy_init (phy); + +DRM_DEBUG_DP ("DP off link/stream done\n" ); +return ret;
Except here we return with a failure.
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl) · line 1854
Quoted 9 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +9
-0+} + +void dp_ctrl_off_phy (struct dp_ctrl *dp_ctrl) +{ +struct dp_ctrl_private *ctrl; +struct dp_io *dp_io; +struct phy *phy; + +if (!dp_ctrl)
Does this ever happen?
Quoted 16 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +13
-0+return ; + + ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); + dp_io = &ctrl->parser->io; + phy = dp_io->phy; + +dp_catalog_ctrl_reset (ctrl->catalog); + +phy_exit (phy); + +DRM_DEBUG_DP ("DP off phy done\n" ); +} +int dp_ctrl_off (struct dp_ctrl *dp_ctrl) {struct dp_ctrl_private *ctrl;
Quoted 96 lines · Stephen Boyd
Quoting Kuogee Hsieh (2021-05-12 16:29:59)
Quoted 8 lines
irq_hpdinterrupt should be handled after dongle plugged in and before dongle unplugged. Henceirq_hpdinterrupt is enabled at the end of the plugin handle and disabled at the beginning of unplugged handle. Currentirq_hpdwithsink_count= 0 is wrongly handled same as the dongle unplugged which tears down the mainlink and disables the phy. This patch fixes this problem by only tearing down the mainlink but keeping phy enabled atirq_hpdwithsink_count= 0 handle so that nextirq_hpewithsink_count=1 can bes/irq_hpe/irq/hpd/
Quoted 44 lines
handled by setup mainlink only.
Changes in v2:
-- addctrl->phy_Power_countChanges in v3:
-- delctrl->phy_Power_count
-- addphy_power_offtodp_ctrl_off_link_stream()Signed-off-by Kuogee Hsieh <[email protected]>--- drivers/gpu/drm/msm/dp/dp_catalog.c | 5 ++-- drivers/gpu/drm/msm/dp/dp_ctrl.c | 54 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 ++ drivers/gpu/drm/msm/dp/dp_display.c | 46 ++++++++++++++++++++++++------- 4 files changed, 94 insertions(+), 13 deletions(-)drivers/gpu/drm/msm/dp/dp_catalog.c +2
-3@@ -582,10 +582,9 @@ void dp_catalog_ctrl_hpd_config(struct dp_catalog *dp_catalog)u32 reftimer =dp_read_aux (catalog,REG_DP_DP_HPD_REFTIMER ); -/* enable HPD interrupts */ +/* enable HPD plug and unplug interrupts */ dp_catalog_hpd_config_intr (dp_catalog, -DP_DP_HPD_PLUG_INT_MASK |DP_DP_IRQ_HPD_INT_MASK - |DP_DP_HPD_UNPLUG_INT_MASK |DP_DP_HPD_REPLUG_INT_MASK , true); +DP_DP_HPD_PLUG_INT_MASK |DP_DP_HPD_UNPLUG_INT_MASK , true);/* Configure REFTIMER and enable it */ reftimer |= DP_DP_HPD_REFTIMER_ENABLE;drivers/gpu/drm/msm/dp/dp_ctrl.c +0
-0drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl) · line 1819
Quoted 9 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +6
-0@@ -1811,6 +1811,60 @@ int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl)return ret; } +int dp_ctrl_off_link_stream (struct dp_ctrl *dp_ctrl) +{ +struct dp_ctrl_private *ctrl; +struct dp_io *dp_io; +struct phy *phy; +int ret =0 ;Please don't assign ret and then reassign it without testing it first.
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl) · line 1821
Quoted 2 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-0+ +if (!dp_ctrl)Does this ever happen?
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl)
Quoted 12 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +11
-0+return -EINVAL ; + + ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); + dp_io = &ctrl->parser->io; + phy = dp_io->phy; + +dp_catalog_ctrl_mainlink_ctrl (ctrl->catalog, false); + + ret =dp_power_clk_enable (ctrl->power,DP_STREAM_PM , false); +if (ret) +DRM_ERROR ("Failed to disable pixel clocks. ret=%d\n" , ret);Why do we continue instead of returning with a failure?
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl)
Quoted 5 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +4
-0+ + ret =dp_power_clk_enable (ctrl->power,DP_CTRL_PM , false); +if (ret) +DRM_ERROR ("Failed to disable link clocks. ret=%d\n" , ret);Same, why do we continue?
Quoted 8 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl) · line 1841
Quoted 5 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +5
-0+ +phy_power_off (phy); +phy_exit (phy); + +/* aux channel down, reinit phy */ So we need to call exit/init to reinitialize the phy? I wonder if there could be some
phy_reinit()function that combines those.
there is no phy_reinit() function existing currently.
we can add phy_reinit() to combine phy_exit/phy_init as long as ther is no changed to phy->init_count.
Quoted 36 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl) · line 1845
Quoted 5 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +4
-0+phy_init (phy); + +DRM_DEBUG_DP ("DP off link/stream done\n" ); +return ret;Except here we return with a failure.
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl) · line 1854
Quoted 9 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +9
-0+} + +void dp_ctrl_off_phy (struct dp_ctrl *dp_ctrl) +{ +struct dp_ctrl_private *ctrl; +struct dp_io *dp_io; +struct phy *phy; + +if (!dp_ctrl)Does this ever happen?
Quoted 16 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +13
-0+return ; + + ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); + dp_io = &ctrl->parser->io; + phy = dp_io->phy; + +dp_catalog_ctrl_reset (ctrl->catalog); + +phy_exit (phy); + +DRM_DEBUG_DP ("DP off phy done\n" ); +} +int dp_ctrl_off (struct dp_ctrl *dp_ctrl){ struct dp_ctrl_private *ctrl;