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

Only IRIS2(_1) should enter the until-now-IS_V6() path and IRIS2_1
can be used instead of openly checking the number of VPP pipes.

Use VPU version comparison in both of these cases instead.

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 9e36ef9..60252d0 100644 (file)
--- a/drivers/media/platform/qcom/venus/hfi_venus.c
+++ b/drivers/media/platform/qcom/venus/hfi_venus.c
@@ -548,10 +548,10 @@ static int venus_halt_axi(struct venus_hfi_device *hdev)
        u32 mask_val;
        int ret;
 
-       if (IS_V6(hdev->core)) {
+       if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core)) {
                writel(0x3, cpu_cs_base + CPU_CS_X2RPMH_V6);
 
-               if (hdev->core->res->num_vpp_pipes == 1)
+               if (IS_IRIS2_1(hdev->core))
                        goto skip_aon_mvp_noc;
 
                writel(0x1, aon_base + AON_WRAPPER_MVP_NOC_LPI_CONTROL);