diff options
authorStanimir Varbanov <stanimir.varbanov@linaro.org>2020-03-04 11:09:49 +0100
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-03-30 11:28:18 +0200
commit2632e7b618a7730969f9782593c29ca53553aa22 (patch)
parentad71693f41aa60217eaf1c29afb49b3aa0a2db5d (diff)
media: venus: firmware: Ignore secure call error on first resumemedia/v5.7-1
With the latest cleanup in qcom scm driver the secure monitor call for setting the remote processor state returns EINVAL when it is called for the first time and after another scm call auth_and_reset. The error returned from scm call could be ignored because the state transition is already done in auth_and_reset. Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org> Cc: stable@vger.kernel.org Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c
index de6812fb55f4..8801a6a7543d 100644
--- a/drivers/media/platform/qcom/venus/firmware.c
+++ b/drivers/media/platform/qcom/venus/firmware.c
@@ -44,8 +44,14 @@ static void venus_reset_cpu(struct venus_core *core)
int venus_set_hw_state(struct venus_core *core, bool resume)
- if (core->use_tz)
- return qcom_scm_set_remote_state(resume, 0);
+ int ret;
+ if (core->use_tz) {
+ ret = qcom_scm_set_remote_state(resume, 0);
+ if (resume && ret == -EINVAL)
+ ret = 0;
+ return ret;
+ }
if (resume)

Privacy Policy