From: Konrad Dybcio <konrad.dybcio@linaro.org>
To: Dikshita Agarwal <quic_dikshita@quicinc.com>,
Stanimir Varbanov <stanimir.k.varbanov@gmail.com>,
Vikash Garodia <quic_vgarodia@quicinc.com>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Dikshita Agarwal <dikshita@qti.qualcomm.com>,
Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
Dikshita Agarwal <dikshita@codeaurora.org>,
Mansur Alisha Shaik <mansur@codeaurora.org>,
Jonathan Marek <jonathan@marek.ca>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Stanimir Varbanov <stanimir.varbanov@linaro.org>,
linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org,
Vikash Garodia <vgarodia@codeaurora.org>
Subject: Re: [PATCH 07/18] media: venus: core: Assign registers based on VPU version
Date: Tue, 7 Mar 2023 12:18:29 +0100 [thread overview]
Message-ID: <9cb64f82-b6d0-44fa-4851-2cb1a5c2c94c@linaro.org> (raw)
In-Reply-To: <a93a16ec-2e56-1d0b-c326-25f490d8f5b5@quicinc.com>
On 7.03.2023 05:57, Dikshita Agarwal wrote:
>
> On 2/28/2023 8:54 PM, Konrad Dybcio wrote:
>> IRIS2(_1) has a different register map compared to other HFI6XX-
>> using VPUs. Take care of it.
>>
>> Signed-off-by: Konrad Dybcio<konrad.dybcio@linaro.org>
>> ---
>> drivers/media/platform/qcom/venus/core.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
>> index c13436d58ed3..bdc14acc8399 100644
>> --- a/drivers/media/platform/qcom/venus/core.c
>> +++ b/drivers/media/platform/qcom/venus/core.c
>> @@ -246,7 +246,7 @@ static int venus_enumerate_codecs(struct venus_core *core, u32 type)
>> 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;
>
> AR50_LITE also should be added here, as I see you have added the same to places where we are using V6 based registers.
>
> if the base addresses are not assigned here properly. the register writing at other places will be wrong, ex: patch 05/18
I have a separate patch set which specifically adds AR50L data,
and they're not 1:1, vbif_base and aon_base are gone (at least
according to techpack/video). I intend to push it when I get it
all working, but here's what it looks like right now:
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index fd9ecb1f7a05..f88b4781c5d0 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -254,6 +254,14 @@ static void venus_assign_register_offsets(struct venus_core *core)
core->wrapper_base = core->base + WRAPPER_BASE_V6;
core->wrapper_tz_base = core->base + WRAPPER_TZ_BASE_V6;
core->aon_base = core->base + AON_BASE_V6;
+ } else if (IS_AR50_LITE(core)) {
+ core->vbif_base = NULL;
+ core->cpu_base = core->base + CPU_BASE_V6;
+ core->cpu_cs_base = core->base + CPU_CS_BASE_V6;
+ core->cpu_ic_base = core->base + CPU_IC_BASE_V6;
+ core->wrapper_base = core->base + WRAPPER_BASE_V6;
+ core->wrapper_tz_base = core->base + WRAPPER_TZ_BASE_V6;
+ core->aon_base = NULL;
} else {
core->vbif_base = core->base + VBIF_BASE;
core->cpu_base = core->base + CPU_BASE;
--
2.39.2
Konrad
>
> Thanks,
>
> Dikshita
>
next prev parent reply other threads:[~2023-03-07 11:19 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-28 15:24 [PATCH 00/18] Venus QoL / maintainability fixes Konrad Dybcio
2023-02-28 15:24 ` [PATCH 01/18] media: venus: hfi_venus: Set venus_sys_idle_indicator to false on V6 Konrad Dybcio
2023-02-28 15:26 ` Bryan O'Donoghue
2023-02-28 15:31 ` Bryan O'Donoghue
2023-02-28 15:37 ` Konrad Dybcio
2023-02-28 15:38 ` Bryan O'Donoghue
2023-02-28 15:41 ` Konrad Dybcio
2023-02-28 16:53 ` Bryan O'Donoghue
2023-03-02 6:39 ` Dikshita Agarwal
2023-03-02 11:33 ` Konrad Dybcio
2023-03-02 11:54 ` Dikshita Agarwal
2023-03-20 14:54 ` Konrad Dybcio
[not found] ` <e93ba74a-ccde-c6bd-4302-8884144d615d@quicinc.com>
[not found] ` <bf5e30fa-5014-5585-3b8e-b1a8d2f95549@quicinc.com>
2023-04-04 17:52 ` Konrad Dybcio
2023-02-28 15:24 ` [PATCH 02/18] media: venus: Introduce VPU version distinction Konrad Dybcio
2023-03-02 7:12 ` Dikshita Agarwal
2023-03-02 11:37 ` Konrad Dybcio
2023-03-30 11:02 ` Vikash Garodia
2023-03-30 11:15 ` Konrad Dybcio
2023-02-28 15:24 ` [PATCH 03/18] media: venus: Add vpu_version to most SoCs Konrad Dybcio
2023-02-28 15:24 ` [PATCH 04/18] media: venus: firmware: Leave a clue for homegrown porters Konrad Dybcio
2023-03-02 8:18 ` Dikshita Agarwal
2023-02-28 15:24 ` [PATCH 05/18] media: venus: hfi_venus: Sanitize venus_boot_core() per-VPU-version Konrad Dybcio
2023-03-02 11:00 ` Dikshita Agarwal
2023-03-02 11:10 ` Konrad Dybcio
2023-03-02 11:58 ` Dikshita Agarwal
2023-02-28 15:24 ` [PATCH 06/18] media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts Konrad Dybcio
2023-02-28 15:33 ` Bryan O'Donoghue
2023-02-28 15:59 ` Konrad Dybcio
2023-03-02 12:27 ` Dikshita Agarwal
2023-02-28 15:24 ` [PATCH 07/18] media: venus: core: Assign registers based on VPU version Konrad Dybcio
2023-03-07 4:57 ` Dikshita Agarwal
2023-03-07 11:18 ` Konrad Dybcio [this message]
2023-02-28 15:24 ` [PATCH 08/18] media: venus: hfi_venus: Fix version checks in venus_halt_axi() Konrad Dybcio
2023-02-28 15:36 ` Bryan O'Donoghue
2023-02-28 16:01 ` Konrad Dybcio
2023-03-02 12:35 ` Dikshita Agarwal
2023-02-28 15:24 ` [PATCH 09/18] media: venus: hfi_venus: Fix version checks in venus_isr() Konrad Dybcio
2023-03-07 6:12 ` Dikshita Agarwal
2023-03-07 6:14 ` Dikshita Agarwal
2023-02-28 15:24 ` [PATCH 10/18] media: venus: hfi_venus: Fix version check in venus_cpu_and_video_core_idle() Konrad Dybcio
2023-02-28 15:40 ` Bryan O'Donoghue
2023-02-28 15:24 ` [PATCH 11/18] media: venus: hfi_venus: Fix version check in venus_cpu_idle_and_pc_ready() Konrad Dybcio
2023-02-28 15:24 ` [PATCH 12/18] media: venus: firmware: Correct IS_V6() checks Konrad Dybcio
2023-02-28 15:48 ` Bryan O'Donoghue
2023-02-28 16:08 ` Konrad Dybcio
2023-02-28 15:24 ` [PATCH 13/18] media: venus: hfi_platform: Check vpu_version instead of device compatible Konrad Dybcio
2023-02-28 15:49 ` Bryan O'Donoghue
2023-02-28 15:24 ` [PATCH 14/18] media: venus: vdec: Fix version check in vdec_set_work_route() Konrad Dybcio
2023-02-28 15:50 ` Bryan O'Donoghue
2023-02-28 15:24 ` [PATCH 15/18] media: venus: Remap bufreq fields on HFI6XX Konrad Dybcio
2023-02-28 15:51 ` Bryan O'Donoghue
2023-02-28 16:05 ` Konrad Dybcio
2023-02-28 15:24 ` [PATCH 16/18] media: venus: Introduce accessors for remapped hfi_buffer_reqs members Konrad Dybcio
2023-02-28 15:54 ` Bryan O'Donoghue
2023-02-28 15:24 ` [PATCH 17/18] media: venus: Use newly-introduced hfi_buffer_requirements accessors Konrad Dybcio
2023-02-28 15:56 ` Bryan O'Donoghue
2023-02-28 16:09 ` Konrad Dybcio
2023-02-28 15:24 ` [PATCH 18/18] media: venus: hfi_venus: Restrict writing SCIACMDARG3 to Venus V1/V2 Konrad Dybcio
2023-02-28 15:57 ` Bryan O'Donoghue
2023-02-28 16:09 ` Konrad Dybcio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9cb64f82-b6d0-44fa-4851-2cb1a5c2c94c@linaro.org \
--to=konrad.dybcio@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=bryan.odonoghue@linaro.org \
--cc=dikshita@codeaurora.org \
--cc=dikshita@qti.qualcomm.com \
--cc=jonathan@marek.ca \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mansur@codeaurora.org \
--cc=mchehab+huawei@kernel.org \
--cc=mchehab@kernel.org \
--cc=quic_dikshita@quicinc.com \
--cc=quic_vgarodia@quicinc.com \
--cc=stanimir.k.varbanov@gmail.com \
--cc=stanimir.varbanov@linaro.org \
--cc=vgarodia@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®