media: venus: hfi_venus: Sanitize venus_isr() per-VPU-version

Replace the general IS_V6 checks with more specific VPU version checks.

Reviewed-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Stanimir Varbanov <stanimir.k.varbanov@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c
index 60252d05781ea3d00a8f14bbbbe41df57c1f6e22..5e4b97b0a4ae1bc3031bcb6e34a942c426bcd562 100644 (file)
--- a/drivers/media/platform/qcom/venus/hfi_venus.c
+++ b/drivers/media/platform/qcom/venus/hfi_venus.c
@@ -1109,7 +1109,7 @@ static irqreturn_t venus_isr(struct venus_core *core)
        wrapper_base = hdev->core->wrapper_base;
 
        status = readl(wrapper_base + WRAPPER_INTR_STATUS);
-       if (IS_V6(core)) {
+       if (IS_IRIS2(core) || IS_IRIS2_1(core)) {
                if (status & WRAPPER_INTR_STATUS_A2H_MASK ||
                    status & WRAPPER_INTR_STATUS_A2HWD_MASK_V6 ||
                    status & CPU_CS_SCIACMDARG0_INIT_IDLE_MSG_MASK)
@@ -1121,7 +1121,7 @@ static irqreturn_t venus_isr(struct venus_core *core)
                        hdev->irq_status = status;
        }
        writel(1, cpu_cs_base + CPU_CS_A2HSOFTINTCLR);
-       if (!IS_V6(core))
+       if (!(IS_IRIS2(core) || IS_IRIS2_1(core)))
                writel(status, wrapper_base + WRAPPER_INTR_CLEAR);
 
        return IRQ_WAKE_THREAD;