Re: [PATCH v5 4/7] drm/msm/dp: move parser->parse() and dp_power_client_init() to probe

[Dmitry Baryshkov]

On 04/10/2023 19:26, Kuogee Hsieh wrote:

Original both parser->parse() and dp_power_client_init() are done at
dp_display_bind() since eDP population is done at binding time.
In the preparation of having eDP population done at probe() time,
move both function from dp_display_bind() to dp_display_probe().

Changes in v4:
-- explain why parser->parse() and dp_power_client_init() are moved to probe 
time
-- tear down sub modules if failed

Changes in v4:
-- split this patch out of "incorporate pm_runtime framework into DP driver" 
patch

Signed-off-by: Kuogee Hsieh 
---
  drivers/gpu/drm/msm/dp/dp_display.c | 22 --
  1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c 
b/drivers/gpu/drm/msm/dp/dp_display.c
index 32663ea..e4942fc 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -276,11 +276,6 @@ static int dp_display_bind(struct device *dev, struct 
device *master,
dp->dp_display.drm_dev = drm;
priv->dp[dp->id] = >dp_display;
  
-	rc = dp->parser->parse(dp->parser);

-   if (rc) {
-   DRM_ERROR("device tree parsing failed\n");
-   goto end;
-   }
  
  
  	dp->drm_dev = drm;

@@ -291,11 +286,6 @@ static int dp_display_bind(struct device *dev, struct 
device *master,
goto end;
}
  
-	rc = dp_power_client_init(dp->power);


As we have moved dp_power_client_init() from bind() to probe(), we 
should also move dp_power_client_deinit() to remove(). Otherwise after 
several bind/unbind attempts the pm enablement count can become negative.



-   if (rc) {
-   DRM_ERROR("Power client create failed\n");
-   goto end;
-   }
  
  	rc = dp_register_audio_driver(dev, dp->audio);

if (rc) {
@@ -1250,6 +1240,18 @@ static int dp_display_probe(struct platform_device *pdev)
return -EPROBE_DEFER;
}
  
+	rc = dp->parser->parse(dp->parser);

+   if (rc) {
+   DRM_ERROR("device tree parsing failed\n");
+   goto err;
+   }
+
+   rc = dp_power_client_init(dp->power);
+   if (rc) {
+   DRM_ERROR("Power client create failed\n");
+   goto err;
+   }
+
/* setup event q */
mutex_init(>event_mutex);
init_waitqueue_head(>event_q);


--
With best wishes
Dmitry

[PATCH v5 4/7] drm/msm/dp: move parser->parse() and dp_power_client_init() to probe

[Kuogee Hsieh]

Original both parser->parse() and dp_power_client_init() are done at
dp_display_bind() since eDP population is done at binding time.
In the preparation of having eDP population done at probe() time,
move both function from dp_display_bind() to dp_display_probe().

Changes in v4:
-- explain why parser->parse() and dp_power_client_init() are moved to probe 
time
-- tear down sub modules if failed

Changes in v4:
-- split this patch out of "incorporate pm_runtime framework into DP driver" 
patch

Signed-off-by: Kuogee Hsieh 
---
 drivers/gpu/drm/msm/dp/dp_display.c | 22 --
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c 
b/drivers/gpu/drm/msm/dp/dp_display.c
index 32663ea..e4942fc 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -276,11 +276,6 @@ static int dp_display_bind(struct device *dev, struct 
device *master,
dp->dp_display.drm_dev = drm;
priv->dp[dp->id] = >dp_display;
 
-   rc = dp->parser->parse(dp->parser);
-   if (rc) {
-   DRM_ERROR("device tree parsing failed\n");
-   goto end;
-   }
 
 
dp->drm_dev = drm;
@@ -291,11 +286,6 @@ static int dp_display_bind(struct device *dev, struct 
device *master,
goto end;
}
 
-   rc = dp_power_client_init(dp->power);
-   if (rc) {
-   DRM_ERROR("Power client create failed\n");
-   goto end;
-   }
 
rc = dp_register_audio_driver(dev, dp->audio);
if (rc) {
@@ -1250,6 +1240,18 @@ static int dp_display_probe(struct platform_device *pdev)
return -EPROBE_DEFER;
}
 
+   rc = dp->parser->parse(dp->parser);
+   if (rc) {
+   DRM_ERROR("device tree parsing failed\n");
+   goto err;
+   }
+
+   rc = dp_power_client_init(dp->power);
+   if (rc) {
+   DRM_ERROR("Power client create failed\n");
+   goto err;
+   }
+
/* setup event q */
mutex_init(>event_mutex);
init_waitqueue_head(>event_q);
-- 
2.7.4