drm/msm/dp: return correct connection status after suspend
PATCH v5 1/1 drm/msm/dp: return correct connection status after suspend
During suspend, dp host controller and hpd block are disabled due to both ahb and aux clock are disabled. Therefore hpd plug/unplug interrupts will not be generated. At dp_pm_resume(), reinitialize both dp host controller and hpd block so that hpd plug/unplug interrupts will be generated and handled by driver so that hpd connection state is updated correctly. This patch will fix link training flaky issues.
Changes in v2:
-- use container_of to cast correct dp_display_private pointer
at both dp_pm_suspend() and dp_pm_resume().
Changes in v3:
-- replace hpd_state atomic_t with u32
Changes in v4
-- call dp_display_host_deinit() at dp_pm_suspend()
-- call dp_display_host_init() at msm_dp_display_enable() -- fix phy->init_count unbalance which causes link training failed
Changes in v4
-- add Fixes tag
--- drivers/gpu/drm/msm/dp/dp_catalog.c | 13 +++ drivers/gpu/drm/msm/dp/dp_catalog.h | 1 + drivers/gpu/drm/msm/dp/dp_ctrl.c | 5 + drivers/gpu/drm/msm/dp/dp_display.c | 144 +++++++++++++++------------- drivers/gpu/drm/msm/dp/dp_reg.h | 2 + 5 files changed, 97 insertions(+), 68 deletions(-)
drivers/gpu/drm/msm/dp/dp_catalog.c +13 -0
@@ -572,6 +572,19 @@ void dp_catalog_ctrl_hpd_config(struct dp_catalog *dp_catalog)dp_write_aux (catalog,REG_DP_DP_HPD_CTRL ,DP_DP_HPD_CTRL_HPD_EN ); } +u32 dp_catalog_hpd_get_state_status (struct dp_catalog *dp_catalog) +{ +struct dp_catalog_private *catalog =container_of (dp_catalog, + struct dp_catalog_private, dp_catalog); +u32 status; + + status =dp_read_aux (catalog,REG_DP_DP_HPD_INT_STATUS ); + status >>=DP_DP_HPD_STATE_STATUS_BITS_SHIFT ; + status &=DP_DP_HPD_STATE_STATUS_BITS_MASK ; + +return status; +} +u32 dp_catalog_hpd_get_intr_status (struct dp_catalog *dp_catalog) { struct dp_catalog_private *catalog = container_of(dp_catalog,
drivers/gpu/drm/msm/dp/dp_catalog.h +1 -0
@@ -97,6 +97,7 @@ void dp_catalog_ctrl_enable_irq(struct dp_catalog *dp_catalog, bool enable);void dp_catalog_hpd_config_intr (struct dp_catalog *dp_catalog,u32 intr_mask,bool en);void dp_catalog_ctrl_hpd_config (struct dp_catalog *dp_catalog); +u32 dp_catalog_hpd_get_state_status (struct dp_catalog *dp_catalog);u32 dp_catalog_hpd_get_intr_status (struct dp_catalog *dp_catalog);void dp_catalog_ctrl_phy_reset (struct dp_catalog *dp_catalog); int dp_catalog_ctrl_update_vx_px(struct dp_catalog *dp_catalog, u8 v_level,
drivers/gpu/drm/msm/dp/dp_ctrl.c +5 -0
@@ -1400,6 +1400,8 @@ int dp_ctrl_host_init(struct dp_ctrl *dp_ctrl, bool flip)void dp_ctrl_host_deinit (struct dp_ctrl *dp_ctrl) {struct dp_ctrl_private *ctrl; +struct dp_io *dp_io; +struct phy *phy;if (!dp_ctrl) {DRM_ERROR ("Invalid input data\n" );
@@ -1407,8 +1409,11 @@ void dp_ctrl_host_deinit(struct dp_ctrl *dp_ctrl) } ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); + dp_io = &ctrl->parser->io; + phy = dp_io->phy;dp_catalog_ctrl_enable_irq (ctrl->catalog, false); +phy_exit (phy);DRM_DEBUG_DP ("Host deinitialized successfully\n" ); }
drivers/gpu/drm/msm/dp/dp_display.c +76 -68
297 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_reg.h +2 -0
@@ -32,6 +32,8 @@#define DP_DP_IRQ_HPD_INT_ACK (0x00000002)#define DP_DP_HPD_REPLUG_INT_ACK (0x00000004)#define DP_DP_HPD_UNPLUG_INT_ACK (0x00000008) +#define DP_DP_HPD_STATE_STATUS_BITS_MASK (0x0000000F) +#define DP_DP_HPD_STATE_STATUS_BITS_SHIFT (0x1C)#define REG_DP_DP_HPD_INT_MASK (0x0000000C)#define DP_DP_HPD_PLUG_INT_MASK (0x00000001)
base-commit: d1ea914925856d397b0b3241428f20b945e31434
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
This patch was applied to qcom/linux.git (refs/heads/for-next):
Hello:
This patch was applied to qcom/linux.git (refs/heads/for-next):
Quoted 8 lines · On Wed, 14 Oct 2020 10:11:03 -0700 you wrote:
During suspend, dp host controller and hpd block are disabled due to both ahb and aux clock are disabled. Therefore hpd plug/unplug interrupts will not be generated. At
dp_pm_resume(), reinitialize both dp host controller and hpd block so that hpd plug/unplug interrupts will be generated and handled by driver so that hpd connection state is updated correctly. This patch will fix link training flaky issues.[...]
Here is the summary with links:
- [v5] drm/msm/dp: return correct connection status after suspend
https://git.kernel.org/qcom/c/19e52bcb27c2
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html