From: Konrad Dybcio <konrad.dybcio@linaro.org>
Date: Tue, 30 May 2023 12:30:41 +0000 (+0200)
Subject: media: venus: core: Assign registers based on VPU version
X-Git-Tag: v6.6-rc1~97^2~145
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6513d80e085db064fc1a61c1c55516f1bc78e27d;p=thirdparty%2Flinux.git

media: venus: core: Assign registers based on 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/core.c b/drivers/media/platform/qcom/venus/core.c
index 80cfadbf16af3..8972845569c2d 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -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;