samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

video: driver: fix core lock acquire and release sequence

Browse Source 
[1] Added return type to strict_check() api and bail out if
    strict_check fails.
[2] Fix all the failures with #1.
[3] Added WARN_ON() for strict_check failure.
[4] Ensured &core->lock is acquired before calling below api's.
    - __write_register
    - __write_register_masked
    - __iface_cmdq_write_relaxed
    - __suspend
    - __resume
    - venus_hfi_core_init
    - venus_hfi_core_deinit.

Change-Id: I7f0a3ca6c2aec2758220c90bff9260367f10820b
Signed-off-by: Govindaraj Rajagopal <grajagop@codeaurora.org>
This commit is contained in:
Govindaraj Rajagopal
2021-05-19 12:18:58 +05:30
parent 945883602d
commit 53578c8ec2
8 changed files with 194 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
driver/vidc/src/msm_vidc_driver.c
View File

@@ -340,6 +340,23 @@ void print_vb2_buffer(const char *str, struct msm_vidc_inst *inst,
}
}
static void __fatal_error(bool fatal)
{
WARN_ON(fatal);
}
static int __strict_check(struct msm_vidc_core *core, const char *function)
{
bool fatal = !mutex_is_locked(&core->lock);
__fatal_error(fatal);
if (fatal)
d_vpr_e("%s: strict check failed\n", function);
return fatal ? -EINVAL : 0;
}
enum msm_vidc_buffer_type v4l2_type_to_driver(u32 type, const char *func)
{
enum msm_vidc_buffer_type buffer_type = 0;
@@ -3996,18 +4013,6 @@ unlock:
return rc;
}
static void __fatal_error(struct msm_vidc_core *core, bool fatal)
{
return;
fatal &= core->capabilities[HW_RESPONSE_TIMEOUT].value;
MSM_VIDC_ERROR(fatal);
}
static void __strict_check(struct msm_vidc_core *core)
{
__fatal_error(core, !mutex_is_locked(&core->lock));
}
static int msm_vidc_core_init_wait(struct msm_vidc_core *core)
{
const int interval = 40;
@@ -4018,7 +4023,9 @@ static int msm_vidc_core_init_wait(struct msm_vidc_core *core)
return -EINVAL;
}
__strict_check(core);
rc = __strict_check(core, __func__);
if (rc)
return rc;
if (core->state != MSM_VIDC_CORE_INIT_WAIT)
return 0;