| Message ID | 20200713225345.20556-2-jonathan@marek.ca (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 17e822f7591fb66162aca07685dc0b01468e5480 |
| Headers | show |
| Series | drm/msm: handle for EPROBE_DEFER for of_icc_get | expand |
On Mon, Jul 13, 2020 at 06:53:40PM -0400, Jonathan Marek wrote: > adreno_gpu_init calls pm_runtime_enable, so adreno_gpu_cleanup needs to > call pm_runtime_disable. Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org> > Signed-off-by: Jonathan Marek <jonathan@marek.ca> > --- > drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > index 89673c7ed473..ad64d4b7e8d7 100644 > --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > @@ -1021,11 +1021,14 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, > void adreno_gpu_cleanup(struct adreno_gpu *adreno_gpu) > { > struct msm_gpu *gpu = &adreno_gpu->base; > + struct msm_drm_private *priv = gpu->dev->dev_private; > unsigned int i; > > for (i = 0; i < ARRAY_SIZE(adreno_gpu->info->fw); i++) > release_firmware(adreno_gpu->fw[i]); > > + pm_runtime_disable(&priv->gpu_pdev->dev); > + > icc_put(gpu->icc_path); > icc_put(gpu->ocmem_icc_path); > > -- > 2.26.1 >
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 89673c7ed473..ad64d4b7e8d7 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -1021,11 +1021,14 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, void adreno_gpu_cleanup(struct adreno_gpu *adreno_gpu) { struct msm_gpu *gpu = &adreno_gpu->base; + struct msm_drm_private *priv = gpu->dev->dev_private; unsigned int i; for (i = 0; i < ARRAY_SIZE(adreno_gpu->info->fw); i++) release_firmware(adreno_gpu->fw[i]); + pm_runtime_disable(&priv->gpu_pdev->dev); + icc_put(gpu->icc_path); icc_put(gpu->ocmem_icc_path);
adreno_gpu_init calls pm_runtime_enable, so adreno_gpu_cleanup needs to call pm_runtime_disable. Signed-off-by: Jonathan Marek <jonathan@marek.ca> --- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 +++ 1 file changed, 3 insertions(+)