media: venus: firmware: Do not toggle WRAPPER_A9SS_SW_RESET on 6xx
authorDikshita Agarwal <dikshita@codeaurora.org>
Fri, 2 Apr 2021 10:06:43 +0000 (12:06 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Tue, 6 Apr 2021 13:57:27 +0000 (15:57 +0200)
Do not toggle the WRAPPER_A9SS_SW_RESET on 6xx.

Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/platform/qcom/venus/firmware.c

index 8c2c681..227bd3b 100644 (file)
@@ -53,10 +53,12 @@ int venus_set_hw_state(struct venus_core *core, bool resume)
                return ret;
        }
 
-       if (resume)
+       if (resume) {
                venus_reset_cpu(core);
-       else
-               writel(1, core->wrapper_base + WRAPPER_A9SS_SW_RESET);
+       } else {
+               if (!IS_V6(core))
+                       writel(1, core->wrapper_base + WRAPPER_A9SS_SW_RESET);
+       }
 
        return 0;
 }