[PATCH RESEND v3 10/15] drm/msm/dp: remove PHY handling from dp_catalog.c

[Kuogee Hsieh]

On 1/26/2024 10:26 AM, Dmitry Baryshkov wrote:
> Inline dp_catalog_aux_update_cfg() and call phy_calibrate() from dp_aux
> functions directly.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
Tested-by: Kuogee Hsieh <quic_khsieh at quicinc.com>
Reviewed-by: Kuogee Hsieh <quic_khsieh at quicinc.com>
> ---
>   drivers/gpu/drm/msm/dp/dp_aux.c     |  9 +++++++--
>   drivers/gpu/drm/msm/dp/dp_aux.h     |  1 +
>   drivers/gpu/drm/msm/dp/dp_catalog.c | 12 ------------
>   drivers/gpu/drm/msm/dp/dp_catalog.h |  1 -
>   drivers/gpu/drm/msm/dp/dp_display.c |  4 +++-
>   5 files changed, 11 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_aux.c b/drivers/gpu/drm/msm/dp/dp_aux.c
> index 03f4951c49f4..adbd5a367395 100644
> --- a/drivers/gpu/drm/msm/dp/dp_aux.c
> +++ b/drivers/gpu/drm/msm/dp/dp_aux.c
> @@ -4,6 +4,7 @@
>    */
>   
>   #include <linux/delay.h>
> +#include <linux/phy/phy.h>
>   #include <drm/drm_print.h>
>   
>   #include "dp_reg.h"
> @@ -23,6 +24,8 @@ struct dp_aux_private {
>   	struct device *dev;
>   	struct dp_catalog *catalog;
>   
> +	struct phy *phy;
> +
>   	struct mutex mutex;
>   	struct completion comp;
>   
> @@ -336,7 +339,7 @@ static ssize_t dp_aux_transfer(struct drm_dp_aux *dp_aux,
>   		if (aux->native) {
>   			aux->retry_cnt++;
>   			if (!(aux->retry_cnt % MAX_AUX_RETRIES))
> -				dp_catalog_aux_update_cfg(aux->catalog);
> +				phy_calibrate(aux->phy);
>   		}
>   		/* reset aux if link is in connected state */
>   		if (dp_catalog_link_is_connected(aux->catalog))
> @@ -439,7 +442,7 @@ void dp_aux_reconfig(struct drm_dp_aux *dp_aux)
>   
>   	aux = container_of(dp_aux, struct dp_aux_private, dp_aux);
>   
> -	dp_catalog_aux_update_cfg(aux->catalog);
> +	phy_calibrate(aux->phy);
>   	dp_catalog_aux_reset(aux->catalog);
>   }
>   
> @@ -517,6 +520,7 @@ static int dp_wait_hpd_asserted(struct drm_dp_aux *dp_aux,
>   }
>   
>   struct drm_dp_aux *dp_aux_get(struct device *dev, struct dp_catalog *catalog,
> +			      struct phy *phy,
>   			      bool is_edp)
>   {
>   	struct dp_aux_private *aux;
> @@ -537,6 +541,7 @@ struct drm_dp_aux *dp_aux_get(struct device *dev, struct dp_catalog *catalog,
>   
>   	aux->dev = dev;
>   	aux->catalog = catalog;
> +	aux->phy = phy;
>   	aux->retry_cnt = 0;
>   
>   	/*
> diff --git a/drivers/gpu/drm/msm/dp/dp_aux.h b/drivers/gpu/drm/msm/dp/dp_aux.h
> index 511305da4f66..16d9b1758748 100644
> --- a/drivers/gpu/drm/msm/dp/dp_aux.h
> +++ b/drivers/gpu/drm/msm/dp/dp_aux.h
> @@ -17,6 +17,7 @@ void dp_aux_deinit(struct drm_dp_aux *dp_aux);
>   void dp_aux_reconfig(struct drm_dp_aux *dp_aux);
>   
>   struct drm_dp_aux *dp_aux_get(struct device *dev, struct dp_catalog *catalog,
> +			      struct phy *phy,
>   			      bool is_edp);
>   void dp_aux_put(struct drm_dp_aux *aux);
>   
> diff --git a/drivers/gpu/drm/msm/dp/dp_catalog.c b/drivers/gpu/drm/msm/dp/dp_catalog.c
> index e07651768805..4c6207797c99 100644
> --- a/drivers/gpu/drm/msm/dp/dp_catalog.c
> +++ b/drivers/gpu/drm/msm/dp/dp_catalog.c
> @@ -7,8 +7,6 @@
>   
>   #include <linux/delay.h>
>   #include <linux/iopoll.h>
> -#include <linux/phy/phy.h>
> -#include <linux/phy/phy-dp.h>
>   #include <linux/rational.h>
>   #include <drm/display/drm_dp_helper.h>
>   #include <drm/drm_print.h>
> @@ -243,16 +241,6 @@ void dp_catalog_aux_enable(struct dp_catalog *dp_catalog, bool enable)
>   	dp_write_aux(catalog, REG_DP_AUX_CTRL, aux_ctrl);
>   }
>   
> -void dp_catalog_aux_update_cfg(struct dp_catalog *dp_catalog)
> -{
> -	struct dp_catalog_private *catalog = container_of(dp_catalog,
> -				struct dp_catalog_private, dp_catalog);
> -	struct dp_io *dp_io = catalog->io;
> -	struct phy *phy = dp_io->phy;
> -
> -	phy_calibrate(phy);
> -}
> -
>   int dp_catalog_aux_wait_for_hpd_connect_state(struct dp_catalog *dp_catalog)
>   {
>   	u32 state;
> diff --git a/drivers/gpu/drm/msm/dp/dp_catalog.h b/drivers/gpu/drm/msm/dp/dp_catalog.h
> index ba7c62ba7ca3..1f3f58d4b8de 100644
> --- a/drivers/gpu/drm/msm/dp/dp_catalog.h
> +++ b/drivers/gpu/drm/msm/dp/dp_catalog.h
> @@ -84,7 +84,6 @@ 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);
> -void dp_catalog_aux_update_cfg(struct dp_catalog *dp_catalog);
>   int dp_catalog_aux_wait_for_hpd_connect_state(struct dp_catalog *dp_catalog);
>   u32 dp_catalog_aux_get_irq(struct dp_catalog *dp_catalog);
>   
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
> index 6fbbd0f93d13..c1a51c498e01 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -729,7 +729,9 @@ static int dp_init_sub_modules(struct dp_display_private *dp)
>   		goto error;
>   	}
>   
> -	dp->aux = dp_aux_get(dev, dp->catalog, dp->dp_display.is_edp);
> +	dp->aux = dp_aux_get(dev, dp->catalog,
> +			     dp->parser->io.phy,
> +			     dp->dp_display.is_edp);
>   	if (IS_ERR(dp->aux)) {
>   		rc = PTR_ERR(dp->aux);
>   		DRM_ERROR("failed to initialize aux, rc = %d\n", rc);
>