diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-26 17:01:50 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-26 17:01:50 -0800 |
| commit | 541fe938d28fd1d61c22f25c031ebf600af2c61d (patch) | |
| tree | 1edf7cb00c49858d06b50e4879006176a169e1c8 /drivers | |
| parent | 49d57d9b26e1a73dfe6e6ec5dfc3725908483696 (diff) | |
| parent | 296dd37fbf9f8f88d63d736d8c88b84cedff4726 (diff) | |
Merge "msm: sde: Remove panic from rotator smmu fault handler"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/msm/sde/rotator/sde_rotator_smmu.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/media/platform/msm/sde/rotator/sde_rotator_smmu.c b/drivers/media/platform/msm/sde/rotator/sde_rotator_smmu.c index 0ca4d910ad72..58cb160f118e 100644 --- a/drivers/media/platform/msm/sde/rotator/sde_rotator_smmu.c +++ b/drivers/media/platform/msm/sde/rotator/sde_rotator_smmu.c @@ -551,11 +551,18 @@ static int sde_smmu_fault_handler(struct iommu_domain *domain, sde_smmu = (struct sde_smmu_client *)token; - /* trigger rotator panic and dump */ - SDEROT_ERR("trigger rotator panic and dump, iova=0x%08lx\n", iova); + /* trigger rotator dump */ + SDEROT_ERR("trigger rotator dump, iova=0x%08lx, flags=0x%x\n", + iova, flags); + SDEROT_ERR("SMMU device:%s", sde_smmu->dev->kobj.name); - sde_rot_dump_panic(); + /* generate dump, but no panic */ + sde_rot_evtlog_tout_handler(false, __func__, "rot", "vbif_dbg_bus"); + /* + * return -ENOSYS to allow smmu driver to dump out useful + * debug info. + */ return rc; } |