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

The current assumption of IS_V6 is overgeneralized. Adjust the logic
to take the VPU hardware version into account.

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 5506a0d..9e36ef9 100644 (file)
--- a/drivers/media/platform/qcom/venus/hfi_venus.c
+++ b/drivers/media/platform/qcom/venus/hfi_venus.c
@@ -447,19 +447,20 @@ static int venus_boot_core(struct venus_hfi_device *hdev)
 {
        struct device *dev = hdev->core->dev;
        static const unsigned int max_tries = 100;
-       u32 ctrl_status = 0, mask_val;
+       u32 ctrl_status = 0, mask_val = 0;
        unsigned int count = 0;
        void __iomem *cpu_cs_base = hdev->core->cpu_cs_base;
        void __iomem *wrapper_base = hdev->core->wrapper_base;
        int ret = 0;
 
-       if (IS_V6(hdev->core)) {
+       if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core)) {
                mask_val = readl(wrapper_base + WRAPPER_INTR_MASK);
                mask_val &= ~(WRAPPER_INTR_MASK_A2HWD_BASK_V6 |
                              WRAPPER_INTR_MASK_A2HCPU_MASK);
        } else {
                mask_val = WRAPPER_INTR_MASK_A2HVCODEC_MASK;
        }
+
        writel(mask_val, wrapper_base + WRAPPER_INTR_MASK);
        writel(1, cpu_cs_base + CPU_CS_SCIACMDARG3);
 
@@ -479,7 +480,7 @@ static int venus_boot_core(struct venus_hfi_device *hdev)
        if (count >= max_tries)
                ret = -ETIMEDOUT;
 
-       if (IS_V6(hdev->core)) {
+       if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core)) {
                writel(0x1, cpu_cs_base + CPU_CS_H2XSOFTINTEN_V6);
                writel(0x0, cpu_cs_base + CPU_CS_X2RPMH_V6);
        }