summaryrefslogtreecommitdiff
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorKonrad Dybcio <konrad.dybcio@linaro.org>2023-05-30 15:30:44 +0300
committerMauro Carvalho Chehab <mchehab@kernel.org>2023-08-10 08:58:35 +0300
commit3b96e82d54a82bd649ec3ff4a04860c40abb49f4 (patch)
treee5dda1cb1bf47183cc7a9f896bccec3c24a4a959 /drivers/media/platform
parent03811969f9f74245050c9066cc9f758b62d837cc (diff)
downloadlinux-3b96e82d54a82bd649ec3ff4a04860c40abb49f4.tar.xz
media: venus: hfi_venus: Sanitize venus_cpu_and_video_core_idle() per-VPU-version
Replace the general IS_V6 checks with more specific VPU version checks. 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>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/qcom/venus/hfi_venus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c
index 5e4b97b0a4ae..b5d7aab03bca 100644
--- a/drivers/media/platform/qcom/venus/hfi_venus.c
+++ b/drivers/media/platform/qcom/venus/hfi_venus.c
@@ -1516,7 +1516,7 @@ static bool venus_cpu_and_video_core_idle(struct venus_hfi_device *hdev)
void __iomem *cpu_cs_base = hdev->core->cpu_cs_base;
u32 ctrl_status, cpu_status;
- if (IS_V6(hdev->core))
+ if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core))
cpu_status = readl(wrapper_tz_base + WRAPPER_TZ_CPU_STATUS_V6);
else
cpu_status = readl(wrapper_base + WRAPPER_CPU_STATUS);