drm/msm/dp: handle irq_hpd with sink_count = 0 correctly
PATCH v6 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_hpd with sink_count =1 can be handled by setup mainlink only. This patch also set dongle into D3 (power off) state at end of handling irq_hpd with sink_count = 0.
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()
Changes in v4:
-- return immediately if clock disable failed at dp_ctrl_off_link_stream()
Changes in v5:
-- set dongle to D3 (power off) state at dp_ctrl_off_link_stream()
Changes in v6:
-- add Fixes tag
--- drivers/gpu/drm/msm/dp/dp_catalog.c | 5 ++-- drivers/gpu/drm/msm/dp/dp_ctrl.c | 55 +++++++++++++++++++++++++++++++++++ drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 ++ drivers/gpu/drm/msm/dp/dp_display.c | 57 +++++++++++++++++++++++++++---------- 4 files changed, 101 insertions(+), 18 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 +55 -0
61 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 +42 -15
105 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-19 13:22:33)
Quoted 24 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_hpdwithsink_count=1 can be handled by setup mainlink only. This patch also set dongle into D3 (power off) state at end of handlingirq_hpdwithsink_count= 0.Changes in v2:
-- addctrl->phy_Power_countChanges in v3:
-- delctrl->phy_Power_count
-- addphy_power_offtodp_ctrl_off_link_stream()Changes in v4:
-- return immediately if clock disable failed atdp_ctrl_off_link_stream()Changes in v5:
-- set dongle to D3 (power off) state atdp_ctrl_off_link_stream()
Quoted 7 lines
Changes in v6:
-- add Fixes tagFixes 94e58e2d06e3 ("drm/msm/dp: reset dp controller only at boot up and pm_resume")Signed-off-by Kuogee Hsieh <[email protected]>---
We can resolve the lingering dual irq issue later on if you don't want to send another round of this. Also, the title says 1/2 so I wonder if there's another patch? Doesn't look like there is but I have to ask. If not, please generate patches with the right -<N> argument or revision range.
Quoted 34 lines · Stephen Boyd
Quoting Kuogee Hsieh (2021-05-19 13:22:33)
Quoted 25 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_hpdwithsink_count=1 can be handled by setup mainlink only. This patch also set dongle into D3 (power off) state at end of handlingirq_hpdwithsink_count= 0.Changes in v2:
-- addctrl->phy_Power_countChanges in v3:
-- delctrl->phy_Power_count
-- addphy_power_offtodp_ctrl_off_link_stream()Changes in v4:
-- return immediately if clock disable failed atdp_ctrl_off_link_stream()Changes in v5:
-- set dongle to D3 (power off) state atdp_ctrl_off_link_stream()Quoted 7 lines
Changes in v6:
-- add Fixes tagFixes 94e58e2d06e3 ("drm/msm/dp: reset dp controller only at boot up and pm_resume")Signed-off-by Kuogee Hsieh <[email protected]>---
Quoted 8 lines
Tested-by Stephen Boyd <[email protected]>Reviewed-by Stephen Boyd <[email protected]>We can resolve the lingering dual irq issue later on if you don't want to send another round of this. Also, the title says 1/2 so I wonder if there's another patch? Doesn't look like there is but I have to ask. If not, please generate patches with the right -<N> argument or revision range.
ok, thanks,
Sorry, the 2nd patch is the xlog debug patch.
I did not submit it.
Quoted 34 lines · Stephen Boyd
Quoting Kuogee Hsieh (2021-05-19 13:22:33)
Quoted 25 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_hpdwithsink_count=1 can be handled by setup mainlink only. This patch also set dongle into D3 (power off) state at end of handlingirq_hpdwithsink_count= 0.Changes in v2:
-- addctrl->phy_Power_countChanges in v3:
-- delctrl->phy_Power_count
-- addphy_power_offtodp_ctrl_off_link_stream()Changes in v4:
-- return immediately if clock disable failed atdp_ctrl_off_link_stream()Changes in v5:
-- set dongle to D3 (power off) state atdp_ctrl_off_link_stream()Quoted 7 lines
Changes in v6:
-- add Fixes tagFixes 94e58e2d06e3 ("drm/msm/dp: reset dp controller only at boot up and pm_resume")Signed-off-by Kuogee Hsieh <[email protected]>---
Quoted 8 lines
Tested-by Stephen Boyd <[email protected]>Reviewed-by Stephen Boyd <[email protected]>We can resolve the lingering dual irq issue later on if you don't want to send another round of this. Also, the title says 1/2 so I wonder if there's another patch? Doesn't look like there is but I have to ask. If not, please generate patches with the right -<N> argument or revision range.
new v6 uploaded