lkml.org 
[lkml]   [2021]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 01/79] media: venus: fix PM runtime logic at venus_sys_error_handler()
Date
The venus_sys_error_handler() assumes that pm_runtime was
able to resume, as it does things like:

while (pm_runtime_active(core->dev_dec) || pm_runtime_active(core->dev_enc))
msleep(10);

Well, if, for whatever reason, this won't happen, the routine
won't do what's expected. So, check for the returned error
condition, warning if it returns an error.

Fixes: af2c3834c8ca ("[media] media: venus: adding core part and helper functions")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
drivers/media/platform/qcom/venus/core.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 54bac7ec14c5..fe63b9ab5b20 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -84,7 +84,11 @@ static void venus_sys_error_handler(struct work_struct *work)
container_of(work, struct venus_core, work.work);
int ret = 0;

- pm_runtime_get_sync(core->dev);
+ ret = pm_runtime_get_sync(core->dev);
+ if (WARN_ON(ret < 0)) {
+ pm_runtime_put_noidle(core->dev);
+ return ret;
+ }

hfi_core_deinit(core, true);

@@ -106,9 +110,13 @@ static void venus_sys_error_handler(struct work_struct *work)

hfi_reinit(core);

- pm_runtime_get_sync(core->dev);
+ ret = pm_runtime_get_sync(core->dev);
+ if (WARN_ON(ret < 0)) {
+ pm_runtime_put_noidle(core->dev);
+ return ret;
+ }

- ret |= venus_boot(core);
+ ret = venus_boot(core);
ret |= hfi_core_resume(core, true);

enable_irq(core->irq);
--
2.30.2
\
 
 \ /
  Last update: 2021-04-27 12:14    [W:0.186 / U:4.540 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site