linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Konrad Dybcio <konrad.dybcio@linaro.org>
To: Stanimir Varbanov <stanimir.k.varbanov@gmail.com>,
	Vikash Garodia <quic_vgarodia@quicinc.com>,
	Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
	Andy Gross <agross@kernel.org>,
	Bjorn Andersson <andersson@kernel.org>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
	Conor Dooley <conor+dt@kernel.org>
Cc: Marijn Suijten <marijn.suijten@somainline.org>,
	Konrad Dybcio <konradybcio@kernel.org>,
	linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	Konrad Dybcio <konrad.dybcio@linaro.org>
Subject: [PATCH 3/6] media: venus: hfi_venus: Support only updating certain bits with presets
Date: Fri, 04 Aug 2023 22:09:10 +0200	[thread overview]
Message-ID: <20230731-topic-8280_venus-v1-3-8c8bbe1983a5@linaro.org> (raw)
In-Reply-To: <20230731-topic-8280_venus-v1-0-8c8bbe1983a5@linaro.org>

On some platforms (like SM8350) we're expected to only touch certain bits
(such as 0 and 4 corresponding to mask 0x11). Add support for doing so.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 drivers/media/platform/qcom/venus/core.h      |  1 +
 drivers/media/platform/qcom/venus/hfi_venus.c | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index d996abd339e1..2999c24392f5 100644
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -38,6 +38,7 @@ struct freq_tbl {
 struct reg_val {
 	u32 reg;
 	u32 value;
+	u32 mask;
 };
 
 struct bw_tbl {
diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c
index 19fc6575a489..d4bad66f7293 100644
--- a/drivers/media/platform/qcom/venus/hfi_venus.c
+++ b/drivers/media/platform/qcom/venus/hfi_venus.c
@@ -349,10 +349,19 @@ static void venus_set_registers(struct venus_hfi_device *hdev)
 	const struct venus_resources *res = hdev->core->res;
 	const struct reg_val *tbl = res->reg_tbl;
 	unsigned int count = res->reg_tbl_size;
-	unsigned int i;
+	unsigned int i, val;
+
+	for (i = 0; i < count; i++) {
+		val = tbl[i].value;
 
-	for (i = 0; i < count; i++)
-		writel(tbl[i].value, hdev->core->base + tbl[i].reg);
+		/* In some cases, we only want to update certain bits */
+		if (tbl[i].mask) {
+			val = readl(hdev->core->base + tbl[i].reg);
+			val = (val & ~tbl[i].mask) | (tbl[i].value & tbl[i].mask);
+		}
+
+		writel(val, hdev->core->base + tbl[i].reg);
+	}
 }
 
 static void venus_soft_int(struct venus_hfi_device *hdev)

-- 
2.41.0


  parent reply	other threads:[~2023-08-04 20:09 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-04 20:09 [PATCH 0/6] SM8350 and SC8280XP venus support Konrad Dybcio
2023-08-04 20:09 ` [PATCH 1/6] media: dt-bindings: Document SC8280XP/SM8350 Venus Konrad Dybcio
2023-08-05 19:29   ` Krzysztof Kozlowski
2023-08-07 12:41     ` Konrad Dybcio
2023-08-07 14:04       ` Krzysztof Kozlowski
2023-08-07 15:02         ` Konrad Dybcio
2023-08-07 15:21           ` Krzysztof Kozlowski
2023-08-07 18:44           ` Bryan O'Donoghue
2023-08-07 18:45             ` Konrad Dybcio
2023-08-07 18:49               ` Bryan O'Donoghue
2023-08-07 18:55                 ` Konrad Dybcio
2023-08-07 19:05                   ` Bryan O'Donoghue
2023-08-09 12:15                     ` Konrad Dybcio
2023-08-09 12:57                       ` Bryan O'Donoghue
2023-08-04 20:09 ` [PATCH 2/6] media: venus: core: Remove trailing commas from of match entries Konrad Dybcio
2023-08-04 21:05   ` Bryan O'Donoghue
2023-08-04 20:09 ` Konrad Dybcio [this message]
2023-08-04 20:50   ` [PATCH 3/6] media: venus: hfi_venus: Support only updating certain bits with presets Bryan O'Donoghue
2023-08-04 20:51     ` Bryan O'Donoghue
2023-08-04 20:09 ` [PATCH 4/6] media: platform: venus: Add optional LLCC path Konrad Dybcio
2023-08-04 21:04   ` Bryan O'Donoghue
2023-08-04 21:06     ` Bryan O'Donoghue
2023-08-26 13:47       ` Konrad Dybcio
2023-08-26 13:38     ` Konrad Dybcio
2023-08-07 10:43   ` Johan Hovold
2023-08-07 13:04     ` Konrad Dybcio
2023-08-04 20:09 ` [PATCH 5/6] media: venus: core: Add SM8350 resource struct Konrad Dybcio
2023-08-04 21:08   ` Bryan O'Donoghue
2023-08-04 21:17     ` Konrad Dybcio
2023-08-04 20:09 ` [PATCH 6/6] media: venus: core: Add SC8280XP " Konrad Dybcio
2023-08-04 21:10   ` Bryan O'Donoghue
2023-08-04 21:10     ` Konrad Dybcio
2023-08-04 21:12       ` Bryan O'Donoghue
2023-08-04 21:17         ` Konrad Dybcio
2023-08-05 12:11           ` Bryan O'Donoghue
2024-01-22 15:13   ` Bryan O'Donoghue

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=20230731-topic-8280_venus-v1-3-8c8bbe1983a5@linaro.org \
    --to=konrad.dybcio@linaro.org \
    --cc=agross@kernel.org \
    --cc=andersson@kernel.org \
    --cc=bryan.odonoghue@linaro.org \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=konradybcio@kernel.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=marijn.suijten@somainline.org \
    --cc=mchehab@kernel.org \
    --cc=quic_vgarodia@quicinc.com \
    --cc=robh+dt@kernel.org \
    --cc=stanimir.k.varbanov@gmail.com \
    /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;
as well as URLs for NNTP newsgroup(s).