| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20180515075859.17217-12-stanimir.varbanov@linaro.org>
Date: Tue, 15 May 2018 10:58:41 +0300
From: Stanimir Varbanov <stanimir.varbanov@...aro.org>
To: Mauro Carvalho Chehab <mchehab@...nel.org>,
Hans Verkuil <hverkuil@...all.nl>
Cc: linux-media@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-arm-msm@...r.kernel.org,
Vikash Garodia <vgarodia@...eaurora.org>,
Stanimir Varbanov <stanimir.varbanov@...aro.org>
Subject: [PATCH v2 11/29] venus: venc,vdec: adds clocks needed for venus 4xx
This extends the clocks number to support suspend and resume
on Venus version 4xx.
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@...aro.org>
---
drivers/media/platform/qcom/venus/core.h | 4 +--
drivers/media/platform/qcom/venus/vdec.c | 42 ++++++++++++++++++++++++++------
drivers/media/platform/qcom/venus/venc.c | 42 ++++++++++++++++++++++++++------
3 files changed, 72 insertions(+), 16 deletions(-)
diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index 8d3e150800c9..b5b9a84e9155 100644
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -92,8 +92,8 @@ struct venus_core {
void __iomem *base;
int irq;
struct clk *clks[VIDC_CLKS_NUM_MAX];
- struct clk *core0_clk;
- struct clk *core1_clk;
+ struct clk *core0_clk, *core0_bus_clk;
+ struct clk *core1_clk, *core1_bus_clk;
struct video_device *vdev_dec;
struct video_device *vdev_enc;
struct v4l2_device v4l2_dev;
diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
index 261a51adeef2..c45452634e7e 100644
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -1081,12 +1081,18 @@ static int vdec_probe(struct platform_device *pdev)
if (!core)
return -EPROBE_DEFER;
- if (core->res->hfi_version == HFI_VERSION_3XX) {
+ if (IS_V3(core) || IS_V4(core)) {
core->core0_clk = devm_clk_get(dev, "core");
if (IS_ERR(core->core0_clk))
return PTR_ERR(core->core0_clk);
}
+ if (IS_V4(core)) {
+ core->core0_bus_clk = devm_clk_get(dev, "bus");
+ if (IS_ERR(core->core0_bus_clk))
+ return PTR_ERR(core->core0_bus_clk);
+ }
+
platform_set_drvdata(pdev, core);
vdev = video_device_alloc();
@@ -1132,12 +1138,23 @@ static __maybe_unused int vdec_runtime_suspend(struct device *dev)
{
struct venus_core *core = dev_get_drvdata(dev);
- if (core->res->hfi_version == HFI_VERSION_1XX)
+ if (IS_V1(core))
return 0;
- writel(0, core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL);
+ if (IS_V3(core))
+ writel(0, core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL);
+ else if (IS_V4(core))
+ writel(0, core->base + WRAPPER_VCODEC0_MMCC_POWER_CONTROL);
+
+ if (IS_V4(core))
+ clk_disable_unprepare(core->core0_bus_clk);
+
clk_disable_unprepare(core->core0_clk);
- writel(1, core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL);
+
+ if (IS_V3(core))
+ writel(1, core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL);
+ else if (IS_V4(core))
+ writel(1, core->base + WRAPPER_VCODEC0_MMCC_POWER_CONTROL);
return 0;
}
@@ -1147,12 +1164,23 @@ static __maybe_unused int vdec_runtime_resume(struct device *dev)
struct venus_core *core = dev_get_drvdata(dev);
int ret;
- if (core->res->hfi_version == HFI_VERSION_1XX)
+ if (IS_V1(core))
return 0;
- writel(0, core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL);
+ if (IS_V3(core))
+ writel(0, core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL);
+ else if (IS_V4(core))
+ writel(0, core->base + WRAPPER_VCODEC0_MMCC_POWER_CONTROL);
+
ret = clk_prepare_enable(core->core0_clk);
- writel(1, core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL);
+
+ if (IS_V4(core))
+ ret |= clk_prepare_enable(core->core0_bus_clk);
+
+ if (IS_V3(core))
+ writel(1, core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL);
+ else if (IS_V4(core))
+ writel(1, core->base + WRAPPER_VCODEC0_MMCC_POWER_CONTROL);
return ret;
}
diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index 947001170a77..bc8c2e7a8d2c 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -1225,12 +1225,18 @@ static int venc_probe(struct platform_device *pdev)
if (!core)
return -EPROBE_DEFER;
- if (core->res->hfi_version == HFI_VERSION_3XX) {
+ if (IS_V3(core) || IS_V4(core)) {
core->core1_clk = devm_clk_get(dev, "core");
if (IS_ERR(core->core1_clk))
return PTR_ERR(core->core1_clk);
}
+ if (IS_V4(core)) {
+ core->core1_bus_clk = devm_clk_get(dev, "bus");
+ if (IS_ERR(core->core1_bus_clk))
+ return PTR_ERR(core->core1_bus_clk);
+ }
+
platform_set_drvdata(pdev, core);
vdev = video_device_alloc();
@@ -1276,12 +1282,23 @@ static __maybe_unused int venc_runtime_suspend(struct device *dev)
{
struct venus_core *core = dev_get_drvdata(dev);
- if (core->res->hfi_version == HFI_VERSION_1XX)
+ if (IS_V1(core))
return 0;
- writel(0, core->base + WRAPPER_VENC_VCODEC_POWER_CONTROL);
+ if (IS_V3(core))
+ writel(0, core->base + WRAPPER_VENC_VCODEC_POWER_CONTROL);
+ else if (IS_V4(core))
+ writel(0, core->base + WRAPPER_VCODEC1_MMCC_POWER_CONTROL);
+
+ if (IS_V4(core))
+ clk_disable_unprepare(core->core1_bus_clk);
+
clk_disable_unprepare(core->core1_clk);
- writel(1, core->base + WRAPPER_VENC_VCODEC_POWER_CONTROL);
+
+ if (IS_V3(core))
+ writel(1, core->base + WRAPPER_VENC_VCODEC_POWER_CONTROL);
+ else if (IS_V4(core))
+ writel(1, core->base + WRAPPER_VCODEC1_MMCC_POWER_CONTROL);
return 0;
}
@@ -1291,12 +1308,23 @@ static __maybe_unused int venc_runtime_resume(struct device *dev)
struct venus_core *core = dev_get_drvdata(dev);
int ret;
- if (core->res->hfi_version == HFI_VERSION_1XX)
+ if (IS_V1(core))
return 0;
- writel(0, core->base + WRAPPER_VENC_VCODEC_POWER_CONTROL);
+ if (IS_V3(core))
+ writel(0, core->base + WRAPPER_VENC_VCODEC_POWER_CONTROL);
+ else if (IS_V4(core))
+ writel(0, core->base + WRAPPER_VCODEC1_MMCC_POWER_CONTROL);
+
ret = clk_prepare_enable(core->core1_clk);
- writel(1, core->base + WRAPPER_VENC_VCODEC_POWER_CONTROL);
+
+ if (IS_V4(core))
+ ret |= clk_prepare_enable(core->core1_bus_clk);
+
+ if (IS_V3(core))
+ writel(1, core->base + WRAPPER_VENC_VCODEC_POWER_CONTROL);
+ else if (IS_V4(core))
+ writel(1, core->base + WRAPPER_VCODEC1_MMCC_POWER_CONTROL);
return ret;
}
--
2.14.1
Powered by blists - more mailing lists