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>
This commit is contained in:
Konrad Dybcio 2023-05-30 14:30:44 +02:00 committed by Mauro Carvalho Chehab
parent 03811969f9
commit 3b96e82d54

View File

@ -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; void __iomem *cpu_cs_base = hdev->core->cpu_cs_base;
u32 ctrl_status, cpu_status; 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); cpu_status = readl(wrapper_tz_base + WRAPPER_TZ_CPU_STATUS_V6);
else else
cpu_status = readl(wrapper_base + WRAPPER_CPU_STATUS); cpu_status = readl(wrapper_base + WRAPPER_CPU_STATUS);