drm/msm: Implement shutdown callback for adreno
Subsystems (4)
PATCH 1/2 drm/msm: Implement shutdown callback for adreno
Implement the shutdown callback for adreno gpu platform device to safely shutdown it before a system reboot. This helps to avoid futher transactions from gpu after the smmu is moved to bypass mode.
--- drivers/gpu/drm/msm/adreno/adreno_device.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/msm/adreno/adreno_device.c +6 -0
@@ -475,6 +475,11 @@ static int adreno_remove(struct platform_device *pdev)return 0 ; } +static void adreno_shutdown (struct platform_device *pdev) +{ +pm_runtime_force_suspend (&pdev->dev); +} +static const struct of_device_id dt_match[] = { { .compatible ="qcom,adreno" }, { .compatible ="qcom,adreno-3xx" },
@@ -509,6 +514,7 @@ static const struct dev_pm_ops adreno_pm_ops = {static struct platform_driver adreno_driver = { .probe = adreno_probe, .remove = adreno_remove, + .shutdown = adreno_shutdown, .driver = { .name ="adreno" , .of_match_table = dt_match,
Signature · 1 line
2.7.4
PATCH 2/2 drm/msm: Fix duplicate gpu node in icc summary
On targets with a6xx gpu, there is a duplicate gpu icc node listed in the interconnect summary. On these targets, calling dev_pm_opp_of_add_table() api initializes the icc nodes for gpu indirectly. So we should avoid using of_icc_get() api in the common probe path. To fix this, we can move of_icc_get() to target specific code where it is required.
--- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 21 +++++++++++++++++++-- drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 20 ++++++++++++++++++-- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 29 +---------------------------- 3 files changed, 38 insertions(+), 32 deletions(-)
drivers/gpu/drm/msm/adreno/a3xx_gpu.c +19 -2
@@ -519,6 +519,8 @@ struct msm_gpu *a3xx_gpu_init(struct drm_device *dev)struct msm_gpu *gpu;struct msm_drm_private *priv = dev->dev_private;struct platform_device *pdev = priv->gpu_pdev; +struct icc_path *ocmem_icc_path; +struct icc_path *icc_path;int ret;if (!pdev) {
@@ -566,13 +568,28 @@ struct msm_gpu *a3xx_gpu_init(struct drm_device *dev) goto fail; } + icc_path =devm_of_icc_get (&pdev->dev,"gfx-mem" ); + ret =IS_ERR (icc_path); +if (ret) + goto fail; + + ocmem_icc_path =devm_of_icc_get (&pdev->dev,"ocmem" ); + ret =IS_ERR (ocmem_icc_path); +if (ret) { +/* allow -ENODATA, ocmem icc is optional */ +if (ret != -ENODATA ) + goto fail; + ocmem_icc_path =NULL ; + } + +/* * Set the ICC path to maximum speed for now by multiplying the fastest * frequency by the bus width (8). We'll want to scale this later on to * improve battery life. */ -icc_set_bw (gpu->icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); -icc_set_bw (gpu->ocmem_icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); +icc_set_bw (icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); +icc_set_bw (ocmem_icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 );return gpu;
drivers/gpu/drm/msm/adreno/a4xx_gpu.c +18 -2
@@ -648,6 +648,8 @@ struct msm_gpu *a4xx_gpu_init(struct drm_device *dev)struct msm_gpu *gpu;struct msm_drm_private *priv = dev->dev_private;struct platform_device *pdev = priv->gpu_pdev; +struct icc_path *ocmem_icc_path; +struct icc_path *icc_path;int ret;if (!pdev) {
@@ -694,13 +696,27 @@ struct msm_gpu *a4xx_gpu_init(struct drm_device *dev) goto fail; } + icc_path =devm_of_icc_get (&pdev->dev,"gfx-mem" ); + ret =IS_ERR (icc_path); +if (ret) + goto fail; + + ocmem_icc_path =devm_of_icc_get (&pdev->dev,"ocmem" ); + ret =IS_ERR (ocmem_icc_path); +if (ret) { +/* allow -ENODATA, ocmem icc is optional */ +if (ret != -ENODATA ) + goto fail; + ocmem_icc_path =NULL ; + } +/* * Set the ICC path to maximum speed for now by multiplying the fastest * frequency by the bus width (8). We'll want to scale this later on to * improve battery life. */ -icc_set_bw (gpu->icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); -icc_set_bw (gpu->ocmem_icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); +icc_set_bw (icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); +icc_set_bw (ocmem_icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 );return gpu;
drivers/gpu/drm/msm/adreno/adreno_gpu.c +1 -28
@@ -920,35 +920,8 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, ret =msm_gpu_init (drm, pdev, &adreno_gpu->base, &funcs->base, adreno_gpu->info->name, &adreno_gpu_config); -if (ret) -return ret; - -/* -* The legacy case, before "interconnect-names", only has a -* single interconnect path which is equivalent to "gfx-mem" -*/ -if (!of_find_property (dev->of_node,"interconnect-names" ,NULL )) { - gpu->icc_path =of_icc_get (dev,NULL ); - }else { - gpu->icc_path =of_icc_get (dev,"gfx-mem" ); - gpu->ocmem_icc_path =of_icc_get (dev,"ocmem" ); - } -if (IS_ERR (gpu->icc_path)) { - ret =PTR_ERR (gpu->icc_path); - gpu->icc_path =NULL ; -return ret; - } - -if (IS_ERR (gpu->ocmem_icc_path)) { - ret =PTR_ERR (gpu->ocmem_icc_path); - gpu->ocmem_icc_path =NULL ; -/* allow -ENODATA, ocmem icc is optional */ -if (ret != -ENODATA ) -return ret; - } - -return 0 ; +return ret; }void adreno_gpu_cleanup (struct adreno_gpu *adreno_gpu)
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/2] drm/msm: Fix duplicate gpu node in icc summary
Quoted 2 lines · Akhil P Oommen
On targets with a6xx gpu, there is a duplicate gpu icc node listed in the interconnect summary. On these targets, calling
This first sentence is confusing to me. I think the following few sentences do a better job of explaining what you are trying to do.
Quoted 43 lines
dev_pm_opp_of_add_table()api initializes the icc nodes for gpu indirectly. So we should avoid usingof_icc_get()api in the common probe path. To fix this, we can moveof_icc_get()to target specific code where it is required.Signed-off-by Akhil P Oommen <[email protected]>--- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 21 +++++++++++++++++++-- drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 20 ++++++++++++++++++-- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 29 +---------------------------- 3 files changed, 38 insertions(+), 32 deletions(-)drivers/gpu/drm/msm/adreno/a3xx_gpu.c +16
-0@@ -519,6 +519,8 @@ struct msm_gpu *a3xx_gpu_init(struct drm_device *dev)struct msm_gpu *gpu;struct msm_drm_private *priv = dev->dev_private;struct platform_device *pdev = priv->gpu_pdev; +struct icc_path *ocmem_icc_path; +struct icc_path *icc_path;int ret;if (!pdev) {@@ -566,13 +568,28 @@ struct msm_gpu *a3xx_gpu_init(struct drm_device *dev) goto fail; } + icc_path =devm_of_icc_get (&pdev->dev,"gfx-mem" ); + ret =IS_ERR (icc_path); +if (ret) + goto fail; + + ocmem_icc_path =devm_of_icc_get (&pdev->dev,"ocmem" ); + ret =IS_ERR (ocmem_icc_path); +if (ret) { +/* allow -ENODATA, ocmem icc is optional */ +if (ret != -ENODATA ) + goto fail; + ocmem_icc_path =NULL ; + } +
drivers/gpu/drm/msm/adreno/a3xx_gpu.c struct msm_gpu *a3xx_gpu_init(struct drm_device *dev) · line 592
Quoted 10 lines
drivers/gpu/drm/msm/adreno/a3xx_gpu.c +3
-2+/* * Set the ICC path to maximum speed for now by multiplying the fastest * frequency by the bus width (8). We'll want to scale this later on to * improve battery life. */ -icc_set_bw (gpu->icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); -icc_set_bw (gpu->ocmem_icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); +icc_set_bw (icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); +icc_set_bw (ocmem_icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 );
This seems reasonable but I hope we can get somebody to sign off on a real a3xx part.
Quoted 33 lines
drivers/gpu/drm/msm/adreno/a3xx_gpu.c +0
-0return gpu;drivers/gpu/drm/msm/adreno/a4xx_gpu.c +15
-0@@ -648,6 +648,8 @@ struct msm_gpu *a4xx_gpu_init(struct drm_device *dev)struct msm_gpu *gpu;struct msm_drm_private *priv = dev->dev_private;struct platform_device *pdev = priv->gpu_pdev; +struct icc_path *ocmem_icc_path; +struct icc_path *icc_path;int ret;if (!pdev) {@@ -694,13 +696,27 @@ struct msm_gpu *a4xx_gpu_init(struct drm_device *dev) goto fail; } + icc_path =devm_of_icc_get (&pdev->dev,"gfx-mem" ); + ret =IS_ERR (icc_path); +if (ret) + goto fail; + + ocmem_icc_path =devm_of_icc_get (&pdev->dev,"ocmem" ); + ret =IS_ERR (ocmem_icc_path); +if (ret) { +/* allow -ENODATA, ocmem icc is optional */ +if (ret != -ENODATA ) + goto fail; + ocmem_icc_path =NULL ; + }
drivers/gpu/drm/msm/adreno/a4xx_gpu.c struct msm_gpu *a4xx_gpu_init(struct drm_device *dev) · line 719
Quoted 10 lines
drivers/gpu/drm/msm/adreno/a4xx_gpu.c +3
-2+/* * Set the ICC path to maximum speed for now by multiplying the fastest * frequency by the bus width (8). We'll want to scale this later on to * improve battery life. */ -icc_set_bw (gpu->icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); -icc_set_bw (gpu->ocmem_icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); +icc_set_bw (icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); +icc_set_bw (ocmem_icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 );
Less confident we can find any 4xx fans to test this, but if a3xx works then so should this (in theory).
Quoted 30 lines
drivers/gpu/drm/msm/adreno/a4xx_gpu.c +0
-0return gpu;drivers/gpu/drm/msm/adreno/adreno_gpu.c +0
-19@@ -920,35 +920,8 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, ret =msm_gpu_init (drm, pdev, &adreno_gpu->base, &funcs->base, adreno_gpu->info->name, &adreno_gpu_config); -if (ret) -return ret; - -/* -* The legacy case, before "interconnect-names", only has a -* single interconnect path which is equivalent to "gfx-mem" -*/ -if (!of_find_property (dev->of_node,"interconnect-names" ,NULL )) { - gpu->icc_path =of_icc_get (dev,NULL ); - }else { - gpu->icc_path =of_icc_get (dev,"gfx-mem" ); - gpu->ocmem_icc_path =of_icc_get (dev,"ocmem" ); - } -if (IS_ERR (gpu->icc_path)) { - ret =PTR_ERR (gpu->icc_path); - gpu->icc_path =NULL ; -return ret; - } -
drivers/gpu/drm/msm/adreno/adreno_gpu.c int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, · line 924
Quoted 10 lines
drivers/gpu/drm/msm/adreno/adreno_gpu.c +1
-9-if (IS_ERR (gpu->ocmem_icc_path)) { - ret =PTR_ERR (gpu->ocmem_icc_path); - gpu->ocmem_icc_path =NULL ; -/* allow -ENODATA, ocmem icc is optional */ -if (ret != -ENODATA ) -return ret; - } - -return 0 ; +return ret;
This could go even further:
return msm_gpu_init(...);
Quoted 6 lines
drivers/gpu/drm/msm/adreno/adreno_gpu.c +0
-0}void adreno_gpu_cleanup (struct adreno_gpu *adreno_gpu)Signature · 1 line
2.7.4
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 2/2] drm/msm: Fix duplicate gpu node in icc summary
Quoted 6 lines · Jordan Crouse
Quoted 2 lines · Akhil P Oommen
On targets with a6xx gpu, there is a duplicate gpu icc node listed in the interconnect summary. On these targets, calling
This first sentence is confusing to me. I think the following few sentences do a better job of explaining what you are trying to do.
I can just remove that line.
Quoted 148 lines
Quoted 44 lines
dev_pm_opp_of_add_table()api initializes the icc nodes for gpu indirectly. So we should avoid usingof_icc_get()api in the common probe path. To fix this, we can moveof_icc_get()to target specific code where it is required.Signed-off-by Akhil P Oommen <[email protected]>--- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 21 +++++++++++++++++++-- drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 20 ++++++++++++++++++-- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 29 +---------------------------- 3 files changed, 38 insertions(+), 32 deletions(-)drivers/gpu/drm/msm/adreno/a3xx_gpu.c +16
-0@@ -519,6 +519,8 @@ struct msm_gpu *a3xx_gpu_init(struct drm_device *dev)struct msm_gpu *gpu;struct msm_drm_private *priv = dev->dev_private;struct platform_device *pdev = priv->gpu_pdev; +struct icc_path *ocmem_icc_path; +struct icc_path *icc_path;int ret;if (!pdev) {@@ -566,13 +568,28 @@ struct msm_gpu *a3xx_gpu_init(struct drm_device *dev) goto fail; } + icc_path =devm_of_icc_get (&pdev->dev,"gfx-mem" ); + ret =IS_ERR (icc_path); +if (ret) + goto fail; + + ocmem_icc_path =devm_of_icc_get (&pdev->dev,"ocmem" ); + ret =IS_ERR (ocmem_icc_path); +if (ret) { +/* allow -ENODATA, ocmem icc is optional */ +if (ret != -ENODATA ) + goto fail; + ocmem_icc_path =NULL ; + } +drivers/gpu/drm/msm/adreno/a3xx_gpu.c struct msm_gpu *a3xx_gpu_init(struct drm_device *dev) · line 592
Quoted 10 lines
drivers/gpu/drm/msm/adreno/a3xx_gpu.c +3
-2+/* * Set the ICC path to maximum speed for now by multiplying the fastest * frequency by the bus width (8). We'll want to scale this later on to * improve battery life. */ -icc_set_bw (gpu->icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); -icc_set_bw (gpu->ocmem_icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); +icc_set_bw (icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); +icc_set_bw (ocmem_icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 );This seems reasonable but I hope we can get somebody to sign off on a real a3xx part.
Quoted 33 lines
drivers/gpu/drm/msm/adreno/a3xx_gpu.c +0
-0return gpu;drivers/gpu/drm/msm/adreno/a4xx_gpu.c +15
-0@@ -648,6 +648,8 @@ struct msm_gpu *a4xx_gpu_init(struct drm_device *dev)struct msm_gpu *gpu;struct msm_drm_private *priv = dev->dev_private;struct platform_device *pdev = priv->gpu_pdev; +struct icc_path *ocmem_icc_path; +struct icc_path *icc_path;int ret;if (!pdev) {@@ -694,13 +696,27 @@ struct msm_gpu *a4xx_gpu_init(struct drm_device *dev) goto fail; } + icc_path =devm_of_icc_get (&pdev->dev,"gfx-mem" ); + ret =IS_ERR (icc_path); +if (ret) + goto fail; + + ocmem_icc_path =devm_of_icc_get (&pdev->dev,"ocmem" ); + ret =IS_ERR (ocmem_icc_path); +if (ret) { +/* allow -ENODATA, ocmem icc is optional */ +if (ret != -ENODATA ) + goto fail; + ocmem_icc_path =NULL ; + }drivers/gpu/drm/msm/adreno/a4xx_gpu.c struct msm_gpu *a4xx_gpu_init(struct drm_device *dev) · line 719
Quoted 10 lines
drivers/gpu/drm/msm/adreno/a4xx_gpu.c +3
-2+/* * Set the ICC path to maximum speed for now by multiplying the fastest * frequency by the bus width (8). We'll want to scale this later on to * improve battery life. */ -icc_set_bw (gpu->icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); -icc_set_bw (gpu->ocmem_icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); +icc_set_bw (icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 ); +icc_set_bw (ocmem_icc_path,0 ,Bps_to_icc (gpu->fast_rate) *8 );Less confident we can find any 4xx fans to test this, but if a3xx works then so should this (in theory).
Quoted 30 lines
drivers/gpu/drm/msm/adreno/a4xx_gpu.c +0
-0return gpu;drivers/gpu/drm/msm/adreno/adreno_gpu.c +0
-19@@ -920,35 +920,8 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, ret =msm_gpu_init (drm, pdev, &adreno_gpu->base, &funcs->base, adreno_gpu->info->name, &adreno_gpu_config); -if (ret) -return ret; - -/* -* The legacy case, before "interconnect-names", only has a -* single interconnect path which is equivalent to "gfx-mem" -*/ -if (!of_find_property (dev->of_node,"interconnect-names" ,NULL )) { - gpu->icc_path =of_icc_get (dev,NULL ); - }else { - gpu->icc_path =of_icc_get (dev,"gfx-mem" ); - gpu->ocmem_icc_path =of_icc_get (dev,"ocmem" ); - } -if (IS_ERR (gpu->icc_path)) { - ret =PTR_ERR (gpu->icc_path); - gpu->icc_path =NULL ; -return ret; - } -drivers/gpu/drm/msm/adreno/adreno_gpu.c int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, · line 924
Quoted 10 lines
drivers/gpu/drm/msm/adreno/adreno_gpu.c +1
-9-if (IS_ERR (gpu->ocmem_icc_path)) { - ret =PTR_ERR (gpu->ocmem_icc_path); - gpu->ocmem_icc_path =NULL ; -/* allow -ENODATA, ocmem icc is optional */ -if (ret != -ENODATA ) -return ret; - } - -return 0 ; +return ret;This could go even further:
Quoted 2 lines
return
msm_gpu_init(...);
Yep, we can do that. Thanks for the feedback.
--Akhil
Quoted 7 lines
Quoted 6 lines
drivers/gpu/drm/msm/adreno/adreno_gpu.c +0
-0}void adreno_gpu_cleanup (struct adreno_gpu *adreno_gpu)Signature · 1 line
2.7.4