Re: [PATCH v2 4/4] drm/msm/dsi: add DSI PHY registers to snapshot data

On 2021-04-26 17:18, Dmitry Baryshkov wrote:

Add DSI PHY registers to the msm state snapshots to be able to check their contents.

Signed-off-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org

Reviewed-by: Abhinav Kumar abhinavk@codeaurora.org

---

drivers/gpu/drm/msm/dsi/dsi.c | 1 + drivers/gpu/drm/msm/dsi/dsi.h | 1 + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 31 +++++++++++++++++++++++---- drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 4 ++++ 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 322d2e535df0..75afc12a7b25 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -269,5 +269,6 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, void msm_dsi_snapshot(struct msm_disp_state *disp_state, struct msm_dsi *msm_dsi) { msm_dsi_host_snapshot(disp_state, msm_dsi->host);

• msm_dsi_phy_snapshot(disp_state, msm_dsi->phy);

}

diff --git a/drivers/gpu/drm/msm/dsi/dsi.h b/drivers/gpu/drm/msm/dsi/dsi.h index b5679cf89413..cea73f9c4be9 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.h +++ b/drivers/gpu/drm/msm/dsi/dsi.h @@ -176,6 +176,7 @@ int msm_dsi_phy_get_clk_provider(struct msm_dsi_phy *phy, struct clk **byte_clk_provider, struct clk **pixel_clk_provider); void msm_dsi_phy_pll_save_state(struct msm_dsi_phy *phy); int msm_dsi_phy_pll_restore_state(struct msm_dsi_phy *phy); +void msm_dsi_phy_snapshot(struct msm_disp_state *disp_state, struct msm_dsi_phy *phy);

#endif /* __DSI_CONNECTOR_H__ */

diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c index f0a2ddf96a4b..bf7a4c20c13c 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c @@ -658,14 +658,14 @@ static int dsi_phy_driver_probe(struct platform_device *pdev) phy->regulator_ldo_mode = of_property_read_bool(dev->of_node, "qcom,dsi-phy-regulator-ldo-mode");

• phy->base = msm_ioremap(pdev, "dsi_phy", "DSI_PHY");

• phy->base = msm_ioremap_size(pdev, "dsi_phy", "DSI_PHY",

&phy->base_size); if (IS_ERR(phy->base)) { DRM_DEV_ERROR(dev, "%s: failed to map phy base\n", __func__); ret = -ENOMEM; goto fail; }

• phy->pll_base = msm_ioremap(pdev, "dsi_pll", "DSI_PLL");

• phy->pll_base = msm_ioremap_size(pdev, "dsi_pll", "DSI_PLL",

&phy->pll_size); if (IS_ERR(phy->pll_base)) { DRM_DEV_ERROR(&pdev->dev, "%s: failed to map pll base\n", __func__); ret = -ENOMEM; @@ -673,7 +673,7 @@ static int dsi_phy_driver_probe(struct platform_device *pdev) }

if (phy->cfg->has_phy_lane) {

• phy->lane_base = msm_ioremap(pdev, "dsi_phy_lane", "DSI_PHY_LANE");
  

• phy->lane_base = msm_ioremap_size(pdev, "dsi_phy_lane",
  

"DSI_PHY_LANE", &phy->lane_size); if (IS_ERR(phy->lane_base)) { DRM_DEV_ERROR(&pdev->dev, "%s: failed to map phy lane base\n", __func__); ret = -ENOMEM; @@ -682,7 +682,7 @@ static int dsi_phy_driver_probe(struct platform_device *pdev) }

if (phy->cfg->has_phy_regulator) {

• phy->reg_base = msm_ioremap(pdev, "dsi_phy_regulator", 
  

"DSI_PHY_REG");

• phy->reg_base = msm_ioremap_size(pdev, "dsi_phy_regulator",
  

"DSI_PHY_REG", &phy->reg_size); if (IS_ERR(phy->reg_base)) { DRM_DEV_ERROR(&pdev->dev, "%s: failed to map phy regulator base\n", __func__); ret = -ENOMEM; @@ -868,3 +868,26 @@ int msm_dsi_phy_pll_restore_state(struct msm_dsi_phy *phy)

return 0; }

+void msm_dsi_phy_snapshot(struct msm_disp_state *disp_state, struct msm_dsi_phy *phy) +{

• msm_disp_snapshot_add_block(disp_state,

• 	phy->base_size, phy->base,
  

• 	"dsi%d_phy", phy->id);
  

• /* Do not try accessing PLL registers if it is switched off */
• if (phy->pll_on)

• msm_disp_snapshot_add_block(disp_state,
  

• 	phy->pll_size, phy->pll_base,
  

• 	"dsi%d_pll", phy->id);
  

• if (phy->lane_base)

• msm_disp_snapshot_add_block(disp_state,
  

• 	phy->lane_size, phy->lane_base,
  

• 	"dsi%d_lane", phy->id);
  

• if (phy->reg_base)

• msm_disp_snapshot_add_block(disp_state,
  

• 	phy->reg_size, phy->reg_base,
  

• 	"dsi%d_reg", phy->id);
  

+} diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h index 94a77ac364d3..5b0feef87127 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h @@ -85,6 +85,10 @@ struct msm_dsi_phy { void __iomem *pll_base; void __iomem *reg_base; void __iomem *lane_base;

• phys_addr_t base_size;

• phys_addr_t pll_size;

• phys_addr_t reg_size;

• phys_addr_t lane_size; int id;

  struct clk *ahb_clk;