drm/msm/dp: Account for the timeout in wait_hpd_asserted() callback

The DP wait_hpd_asserted() callback is passed a timeout which
indicates how long we should wait for HPD. This timeout was being
ignored in the MSM DP implementation and instead a hardcoded 500 ms
timeout was used. Fix it to use the proper timeout.

As part of this we move the hardcoded 500 ms number into the AUX
transfer function, which isn't given a timeout. The wait in the AUX
transfer function will be removed in a future commit.

Fixes: e2969ee30252 ("drm/msm/dp: move of_dp_aux_populate_bus() to eDP probe()")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/583128/
Link: https://lore.kernel.org/r/20240315143621.v2.2.I7758d18a1773821fa39c034b16a12ef3f18a51ee@changeid
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --git a/drivers/gpu/drm/msm/dp/dp_aux.c b/drivers/gpu/drm/msm/dp/dp_aux.c
index f98d089ea5b1a9c87b62dcf90e4af72582de53ee..707489776e913f481d546ee0d98a2d73fcb6eaf0 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_aux.c
+++ b/drivers/gpu/drm/msm/dp/dp_aux.c
@@ -325,7 +325,8 @@ static ssize_t dp_aux_transfer(struct drm_dp_aux *dp_aux,
         * avoid ever doing the extra long wait for DP.
         */
        if (aux->is_edp) {
-               ret = dp_catalog_aux_wait_for_hpd_connect_state(aux->catalog);
+               ret = dp_catalog_aux_wait_for_hpd_connect_state(aux->catalog,
+                                                               500000);
                if (ret) {
                        DRM_DEBUG_DP("Panel not ready for aux transactions\n");
                        goto exit;
@@ -533,7 +534,7 @@ static int dp_wait_hpd_asserted(struct drm_dp_aux *dp_aux,
        aux = container_of(dp_aux, struct dp_aux_private, dp_aux);
 
        pm_runtime_get_sync(aux->dev);
-       ret = dp_catalog_aux_wait_for_hpd_connect_state(aux->catalog);
+       ret = dp_catalog_aux_wait_for_hpd_connect_state(aux->catalog, wait_us);
        pm_runtime_put_sync(aux->dev);
 
        return ret;

diff --git a/drivers/gpu/drm/msm/dp/dp_catalog.c b/drivers/gpu/drm/msm/dp/dp_catalog.c
index 3e7c84cdef472c0c71cfb7f06cd565d6d65aa3bd..628c8181ddd48f379e4df22145bc7e789585c127 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_catalog.c
+++ b/drivers/gpu/drm/msm/dp/dp_catalog.c
@@ -263,17 +263,18 @@ void dp_catalog_aux_enable(struct dp_catalog *dp_catalog, bool enable)
        dp_write_aux(catalog, REG_DP_AUX_CTRL, aux_ctrl);
 }
 
-int dp_catalog_aux_wait_for_hpd_connect_state(struct dp_catalog *dp_catalog)
+int dp_catalog_aux_wait_for_hpd_connect_state(struct dp_catalog *dp_catalog,
+                                             unsigned long wait_us)
 {
        u32 state;
        struct dp_catalog_private *catalog = container_of(dp_catalog,
                                struct dp_catalog_private, dp_catalog);
 
-       /* poll for hpd connected status every 2ms and timeout after 500ms */
+       /* poll for hpd connected status every 2ms and timeout after wait_us */
        return readl_poll_timeout(catalog->io.aux.base +
                                REG_DP_DP_HPD_INT_STATUS,
                                state, state & DP_DP_HPD_STATE_STATUS_CONNECTED,
-                               2000, 500000);
+                               min(wait_us, 2000), wait_us);
 }
 
 static void dump_regs(void __iomem *base, int len)

diff --git a/drivers/gpu/drm/msm/dp/dp_catalog.h b/drivers/gpu/drm/msm/dp/dp_catalog.h
index 75ec290127c775cc009e3809d6b8314e57f60115..72a85810607e8d776a67bc6d4cb82981a2d4c95f 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_catalog.h
+++ b/drivers/gpu/drm/msm/dp/dp_catalog.h
@@ -87,7 +87,8 @@ int dp_catalog_aux_clear_trans(struct dp_catalog *dp_catalog, bool read);
 int dp_catalog_aux_clear_hw_interrupts(struct dp_catalog *dp_catalog);
 void dp_catalog_aux_reset(struct dp_catalog *dp_catalog);
 void dp_catalog_aux_enable(struct dp_catalog *dp_catalog, bool enable);
-int dp_catalog_aux_wait_for_hpd_connect_state(struct dp_catalog *dp_catalog);
+int dp_catalog_aux_wait_for_hpd_connect_state(struct dp_catalog *dp_catalog,
+                                             unsigned long wait_us);
 u32 dp_catalog_aux_get_irq(struct dp_catalog *dp_catalog);
 
 /* DP Controller APIs */