drm/msm/dp: handle irq_hpd with sink_count = 0 correctly
PATCH v2 1/1 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
--- drivers/gpu/drm/msm/dp/dp_catalog.c | 5 +-- drivers/gpu/drm/msm/dp/dp_ctrl.c | 83 ++++++++++++++++++++++++++++++++++--- drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 + drivers/gpu/drm/msm/dp/dp_display.c | 46 +++++++++++++++----- 4 files changed, 118 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 +78 -5
125 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 10:29:18)
Quoted 43 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 handled by setup mainlink only.Changes in v2:
-- addctrl->phy_Power_countSigned-off-by Kuogee Hsieh <[email protected]>--- drivers/gpu/drm/msm/dp/dp_catalog.c | 5 +-- drivers/gpu/drm/msm/dp/dp_ctrl.c | 83 ++++++++++++++++++++++++++++++++++--- drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 + drivers/gpu/drm/msm/dp/dp_display.c | 46 +++++++++++++++----- 4 files changed, 118 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 +0
-0
drivers/gpu/drm/msm/dp/dp_ctrl.c struct dp_ctrl_private { · line 80
Quoted 4 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +1
-0@@ -77,6 +77,8 @@ struct dp_ctrl_private {struct dp_parser *parser;struct dp_catalog *catalog; +int phy_power_count;
This is still redundant. Please restructure the code to call the power on/off function in one place and the init/exit function in another so that we don't have to reference count it.
Quoted 51 lines · Stephen Boyd
Quoting Kuogee Hsieh (2021-05-12 10:29:18)
Quoted 50 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 handled by setup mainlink only.Changes in v2:
-- addctrl->phy_Power_countSigned-off-by Kuogee Hsieh <[email protected]>--- drivers/gpu/drm/msm/dp/dp_catalog.c | 5 +-- drivers/gpu/drm/msm/dp/dp_ctrl.c | 83 ++++++++++++++++++++++++++++++++++--- drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 + drivers/gpu/drm/msm/dp/dp_display.c | 46 +++++++++++++++----- 4 files changed, 118 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 +0
-0@@ -77,6 +77,8 @@ struct dp_ctrl_private {struct dp_parser *parser;struct dp_catalog *catalog;
Quoted 5 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c struct dp_ctrl_private { · line 80
Quoted 1 line
drivers/gpu/drm/msm/dp/dp_ctrl.c +1
-0+int phy_power_count;This is still redundant. Please restructure the code to call the power on/off function in one place and the init/exit function in another so that we don't have to reference count it.
ok, v3 patch uploaded