diff options
| author | Umesh Pandey <umeshp@codeaurora.org> | 2016-10-05 14:44:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-06 17:14:28 -0700 |
| commit | 00f2e3e6dc4b41a41827925261c51ce3ab503e96 (patch) | |
| tree | 8d0c34872fa2c067148c8e58fdc008734997dc83 /drivers | |
| parent | 8ec8b328f3c5248b1a728d08f1fc356f0d4a6fc6 (diff) | |
msm: vidc: Selectively handle SYS_ERROR as FATAL
User SSR triggers a SYS_ERROR from the hardware.
However the driver cannot detect if the error is
due to user SSR or other reasons. Handle SYS_ERROR
due to user SSR as non-fatal
CRs-Fixed: 1054921
Change-Id: I4151b6bfb24e55c1f1a38bfdca012f7b7af86603
Signed-off-by: Umesh Pandey <umeshp@codeaurora.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/msm/vidc/msm_vidc_common.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_common.c b/drivers/media/platform/msm/vidc/msm_vidc_common.c index 40643239712f..a6563aae4c8c 100644 --- a/drivers/media/platform/msm/vidc/msm_vidc_common.c +++ b/drivers/media/platform/msm/vidc/msm_vidc_common.c @@ -4792,9 +4792,20 @@ int msm_vidc_trigger_ssr(struct msm_vidc_core *core, return -EINVAL; } hdev = core->device; - if (core->state == VIDC_CORE_INIT_DONE) + if (core->state == VIDC_CORE_INIT_DONE) { + /* + * In current implementation user-initiated SSR triggers + * a fatal error from hardware. However, there is no way + * to know if fatal error is due to SSR or not. Handle + * user SSR as non-fatal. + */ + mutex_lock(&core->lock); + core->resources.debug_timeout = false; + mutex_unlock(&core->lock); rc = call_hfi_op(hdev, core_trigger_ssr, hdev->hfi_device_data, type); + } + return rc; } |