evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: sde: Remove panic from rotator smmu fault handler"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-26 17:01:50 -08:00 • committed by Gerrit - the friendly Code Review server
commit 541fe938d2
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/media/platform/msm/sde/rotator/sde_rotator_smmu.c
View file

@ -551,11 +551,18 @@ static int sde_smmu_fault_handler(struct iommu_domain *domain,
sde_smmu = (struct sde_smmu_client *)token; sde_smmu = (struct sde_smmu_client *)token;
/* trigger rotator panic and dump */ /* trigger rotator dump */
SDEROT_ERR("trigger rotator panic and dump, iova=0x%08lx\n", iova); 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; return rc;
} }