Capture coredump on GPU or GMU errors during initialization to help in debugging the issues. To be consistent with the locks while calling msm_gpu_crashstate_capture(), call pm_runtime_get(gpu) always with msm_gpu->lock.
Signed-off-by: Akhil P Oommen <[email protected]> --- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 1 + drivers/gpu/drm/msm/adreno/adreno_device.c | 7 +++++-- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 ++ drivers/gpu/drm/msm/msm_gpu.c | 5 +++-- drivers/gpu/drm/msm/msm_gpu.h | 2 ++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index 690d3e53e273..6d511dc54e43 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -1240,6 +1240,7 @@ int a6xx_gmu_resume(struct a6xx_gpu *a6xx_gpu) /* On failure, shut down the GMU to leave it in a good state */ if (ret) { disable_irq(gmu->gmu_irq); + msm_gpu_crashstate_capture(gpu, NULL, NULL, NULL, NULL); a6xx_rpmh_stop(gmu); pm_runtime_put(gmu->gxpd); pm_runtime_put(gmu->dev); diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index 4edfe80c5be7..85b3e1f0e4fa 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -105,6 +105,7 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev) */ pm_runtime_enable(&pdev->dev); + mutex_lock(&gpu->lock); ret = pm_runtime_get_sync(&pdev->dev); if (ret < 0) { pm_runtime_put_noidle(&pdev->dev); @@ -112,15 +113,15 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev) goto err_disable_rpm; } - mutex_lock(&gpu->lock); ret = msm_gpu_hw_init(gpu); - mutex_unlock(&gpu->lock); if (ret) { + msm_gpu_crashstate_capture(gpu, NULL, NULL, NULL, NULL); DRM_DEV_ERROR(dev->dev, "gpu hw init failed: %d\n", ret); goto err_put_rpm; } pm_runtime_put_autosuspend(&pdev->dev); + mutex_unlock(&gpu->lock); #ifdef CONFIG_DEBUG_FS if (gpu->funcs->debugfs_init) { @@ -136,6 +137,8 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev) err_disable_rpm: pm_runtime_disable(&pdev->dev); + mutex_unlock(&gpu->lock); + return NULL; } diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 1bc0e570bd12..10d9e5f40640 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -391,9 +391,11 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx, return 0; case MSM_PARAM_TIMESTAMP: if (adreno_gpu->funcs->get_timestamp) { + mutex_lock(&gpu->lock); pm_runtime_get_sync(&gpu->pdev->dev); *value = (uint64_t) adreno_gpu->funcs->get_timestamp(gpu); pm_runtime_put_autosuspend(&gpu->pdev->dev); + mutex_unlock(&gpu->lock); return 0; } diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 995549d0bbbc..472db2c916f9 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -361,7 +361,7 @@ static void crashstate_get_vm_logs(struct msm_gpu_state *state, struct msm_gem_v mutex_unlock(&vm->mmu_lock); } -static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, +void msm_gpu_crashstate_capture(struct msm_gpu *gpu, struct msm_gem_submit *submit, struct msm_gpu_fault_info *fault_info, char *comm, char *cmd) { @@ -886,7 +886,8 @@ void msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) pm_runtime_get_sync(&gpu->pdev->dev); - msm_gpu_hw_init(gpu); + if (msm_gpu_hw_init(gpu)) + msm_gpu_crashstate_capture(gpu, NULL, NULL, NULL, NULL); submit->seqno = submit->hw_fence->seqno; diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 666cf499b7ec..eb5b3a7b81f9 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -747,6 +747,8 @@ static inline void msm_gpu_crashstate_put(struct msm_gpu *gpu) } void msm_gpu_fault_crashstate_capture(struct msm_gpu *gpu, struct msm_gpu_fault_info *fault_info); +void msm_gpu_crashstate_capture(struct msm_gpu *gpu, struct msm_gem_submit *submit, + struct msm_gpu_fault_info *fault_info, char *comm, char *cmd); /* * Simple macro to semi-cleanly add the MAP_PRIV flag for targets that can -- 2.51.0
