drm/msm: allow passing struct msm_kms to msm_drv_probe()

lumag · robclark · commit a2ab5d5bb6b1 · 2023-10-09T11:31:30.000-07:00
In preparation of moving resource allocation to the probe time, allow MSM KMS drivers to pass struct msm_kms pointer via msm_drv_probe(). Reviewed-by: Rob Clark <robdclark@gmail.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/561627/ Signed-off-by: Rob Clark <robdclark@chromium.org>
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -1299,7 +1299,7 @@ static int dpu_kms_init(struct drm_device *ddev)
 
 static int dpu_dev_probe(struct platform_device *pdev)
 {
-	return msm_drv_probe(&pdev->dev, dpu_kms_init);
+	return msm_drv_probe(&pdev->dev, dpu_kms_init, NULL);
 }
 
 static int dpu_dev_remove(struct platform_device *pdev)
diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
@@ -557,7 +557,7 @@ static const struct dev_pm_ops mdp4_pm_ops = {
 
 static int mdp4_probe(struct platform_device *pdev)
 {
-	return msm_drv_probe(&pdev->dev, mdp4_kms_init);
+	return msm_drv_probe(&pdev->dev, mdp4_kms_init, NULL);
 }
 
 static int mdp4_remove(struct platform_device *pdev)
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
@@ -939,7 +939,7 @@ static int mdp5_dev_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	return msm_drv_probe(&pdev->dev, mdp5_kms_init);
+	return msm_drv_probe(&pdev->dev, mdp5_kms_init, NULL);
 }
 
 static int mdp5_dev_remove(struct platform_device *pdev)
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
@@ -1230,7 +1230,8 @@ const struct component_master_ops msm_drm_ops = {
 };
 
 int msm_drv_probe(struct device *master_dev,
-	int (*kms_init)(struct drm_device *dev))
+	int (*kms_init)(struct drm_device *dev),
+	struct msm_kms *kms)
 {
 	struct msm_drm_private *priv;
 	struct component_match *match = NULL;
@@ -1240,6 +1241,7 @@ int msm_drv_probe(struct device *master_dev,
 	if (!priv)
 		return -ENOMEM;
 
+	priv->kms = kms;
 	priv->kms_init = kms_init;
 	dev_set_drvdata(master_dev, priv);
 
@@ -1275,7 +1277,7 @@ int msm_drv_probe(struct device *master_dev,
 
 static int msm_pdev_probe(struct platform_device *pdev)
 {
-	return msm_drv_probe(&pdev->dev, NULL);
+	return msm_drv_probe(&pdev->dev, NULL, NULL);
 }
 
 static int msm_pdev_remove(struct platform_device *pdev)
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
@@ -570,7 +570,8 @@ int msm_pm_prepare(struct device *dev);
 void msm_pm_complete(struct device *dev);
 
 int msm_drv_probe(struct device *dev,
-	int (*kms_init)(struct drm_device *dev));
+	int (*kms_init)(struct drm_device *dev),
+	struct msm_kms *kms);
 void msm_drv_shutdown(struct platform_device *pdev);
 
 

Original file line number	Diff line number	Diff line change
`@@ -1299,7 +1299,7 @@ static int dpu_kms_init(struct drm_device *ddev)`
`1299`	`1299`
`1300`	`1300`	`static int dpu_dev_probe(struct platform_device *pdev)`
`1301`	`1301`	`{`
`1302`		`- return msm_drv_probe(&pdev->dev, dpu_kms_init);`
	`1302`	`+ return msm_drv_probe(&pdev->dev, dpu_kms_init, NULL);`
`1303`	`1303`	`}`
`1304`	`1304`
`1305`	`1305`	`static int dpu_dev_remove(struct platform_device *pdev)`
Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,7 @@ static const struct dev_pm_ops mdp4_pm_ops = {`
`557`	`557`
`558`	`558`	`static int mdp4_probe(struct platform_device *pdev)`
`559`	`559`	`{`
`560`		`- return msm_drv_probe(&pdev->dev, mdp4_kms_init);`
	`560`	`+ return msm_drv_probe(&pdev->dev, mdp4_kms_init, NULL);`
`561`	`561`	`}`
`562`	`562`
`563`	`563`	`static int mdp4_remove(struct platform_device *pdev)`
Original file line number	Diff line number	Diff line change
`@@ -939,7 +939,7 @@ static int mdp5_dev_probe(struct platform_device *pdev)`
`939`	`939`	`if (ret)`
`940`	`940`	`return ret;`
`941`	`941`
`942`		`- return msm_drv_probe(&pdev->dev, mdp5_kms_init);`
	`942`	`+ return msm_drv_probe(&pdev->dev, mdp5_kms_init, NULL);`
`943`	`943`	`}`
`944`	`944`
`945`	`945`	`static int mdp5_dev_remove(struct platform_device *pdev)`