diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-07 22:15:44 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-07 22:15:44 -0700 |
| commit | 3ffe336b5e3673039568fabea7785ff066c32fca (patch) | |
| tree | 12913445c5ceafe96ef4036e95ec2e4e34b104e7 /drivers | |
| parent | dc9ba857fb7ba99dfee21b2db9c46aa042e37b4d (diff) | |
| parent | 00f2e3e6dc4b41a41827925261c51ce3ab503e96 (diff) | |
Merge "msm: vidc: Selectively handle SYS_ERROR as FATAL"
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; } |