media: venus: core: Assign registers based on VPU version
authorKonrad Dybcio <konrad.dybcio@linaro.org>
Tue, 30 May 2023 12:30:41 +0000 (14:30 +0200)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Thu, 10 Aug 2023 05:58:34 +0000 (07:58 +0200)
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>
drivers/media/platform/qcom/venus/core.c

index 80cfadb..8972845 100644 (file)
@@ -247,7 +247,7 @@ err:
 
 static void venus_assign_register_offsets(struct venus_core *core)
 {
-       if (IS_V6(core)) {
+       if (IS_IRIS2(core) || IS_IRIS2_1(core)) {
                core->vbif_base = core->base + VBIF_BASE;
                core->cpu_base = core->base + CPU_BASE_V6;
                core->cpu_cs_base = core->base + CPU_CS_BASE_V6;