* [PATCH v5 01/16] dt-binding: mediatek: Get rid of mediatek,larb for multimedia HW
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
@ 2021-04-10 9:11 ` Yong Wu
2021-04-10 9:11 ` [PATCH v5 02/16] iommu/mediatek: Add probe_defer for smi-larb Yong Wu
` (15 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Yong Wu @ 2021-04-10 9:11 UTC (permalink / raw)
To: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, yong.wu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot
After adding device_link between the consumer with the smi-larbs,
if the consumer call its owner pm_runtime_get(_sync), the
pm_runtime_get(_sync) of smi-larb and smi-common will be called
automatically. Thus, the consumer don't need the property.
And IOMMU also know which larb this consumer connects with from
iommu id in the "iommus=" property.
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Reviewed-by: Evan Green <evgreen@chromium.org>
---
.../bindings/display/mediatek/mediatek,disp.txt | 9 ---------
.../devicetree/bindings/media/mediatek-jpeg-decoder.txt | 4 ----
.../devicetree/bindings/media/mediatek-jpeg-encoder.txt | 4 ----
Documentation/devicetree/bindings/media/mediatek-mdp.txt | 8 --------
.../devicetree/bindings/media/mediatek-vcodec.txt | 4 ----
5 files changed, 29 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
index 93b160df3eec..6336bae8a6d7 100644
--- a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
@@ -61,8 +61,6 @@ Required properties (DMA function blocks):
"mediatek,<chip>-disp-rdma"
"mediatek,<chip>-disp-wdma"
the supported chips are mt2701, mt8167 and mt8173.
-- larb: Should contain a phandle pointing to the local arbiter device as defined
- in Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml
- iommus: Should point to the respective IOMMU block with master port as
argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
for details.
@@ -91,7 +89,6 @@ ovl0: ovl@1400c000 {
power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
clocks = <&mmsys CLK_MM_DISP_OVL0>;
iommus = <&iommu M4U_PORT_DISP_OVL0>;
- mediatek,larb = <&larb0>;
};
ovl1: ovl@1400d000 {
@@ -101,7 +98,6 @@ ovl1: ovl@1400d000 {
power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
clocks = <&mmsys CLK_MM_DISP_OVL1>;
iommus = <&iommu M4U_PORT_DISP_OVL1>;
- mediatek,larb = <&larb4>;
};
rdma0: rdma@1400e000 {
@@ -111,7 +107,6 @@ rdma0: rdma@1400e000 {
power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
clocks = <&mmsys CLK_MM_DISP_RDMA0>;
iommus = <&iommu M4U_PORT_DISP_RDMA0>;
- mediatek,larb = <&larb0>;
mediatek,rdma-fifosize = <8192>;
};
@@ -122,7 +117,6 @@ rdma1: rdma@1400f000 {
power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
clocks = <&mmsys CLK_MM_DISP_RDMA1>;
iommus = <&iommu M4U_PORT_DISP_RDMA1>;
- mediatek,larb = <&larb4>;
};
rdma2: rdma@14010000 {
@@ -132,7 +126,6 @@ rdma2: rdma@14010000 {
power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
clocks = <&mmsys CLK_MM_DISP_RDMA2>;
iommus = <&iommu M4U_PORT_DISP_RDMA2>;
- mediatek,larb = <&larb4>;
};
wdma0: wdma@14011000 {
@@ -142,7 +135,6 @@ wdma0: wdma@14011000 {
power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
clocks = <&mmsys CLK_MM_DISP_WDMA0>;
iommus = <&iommu M4U_PORT_DISP_WDMA0>;
- mediatek,larb = <&larb0>;
};
wdma1: wdma@14012000 {
@@ -152,7 +144,6 @@ wdma1: wdma@14012000 {
power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
clocks = <&mmsys CLK_MM_DISP_WDMA1>;
iommus = <&iommu M4U_PORT_DISP_WDMA1>;
- mediatek,larb = <&larb4>;
};
color0: color@14013000 {
diff --git a/Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt b/Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
index cf60c5acc0e4..7978f210e3d4 100644
--- a/Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
+++ b/Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
@@ -15,9 +15,6 @@ Required properties:
- clock-names: must contain "jpgdec-smi" and "jpgdec".
- power-domains: a phandle to the power domain, see
Documentation/devicetree/bindings/power/power_domain.txt for details.
-- mediatek,larb: must contain the local arbiters in the current Socs, see
- Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml
- for details.
- iommus: should point to the respective IOMMU block with master port as
argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
for details.
@@ -32,7 +29,6 @@ Example:
clock-names = "jpgdec-smi",
"jpgdec";
power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>;
- mediatek,larb = <&larb2>;
iommus = <&iommu MT2701_M4U_PORT_JPGDEC_WDMA>,
<&iommu MT2701_M4U_PORT_JPGDEC_BSDMA>;
};
diff --git a/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt b/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt
index acfb50375b8a..4b3664987362 100644
--- a/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt
+++ b/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt
@@ -13,9 +13,6 @@ Required properties:
- clock-names: must contain "jpgenc". It is the clock of JPEG encoder.
- power-domains: a phandle to the power domain, see
Documentation/devicetree/bindings/power/power_domain.txt for details.
-- mediatek,larb: must contain the local arbiters in the current SoCs, see
- Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml
- for details.
- iommus: should point to the respective IOMMU block with master port as
argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
for details.
@@ -29,7 +26,6 @@ Example:
clocks = <&imgsys CLK_IMG_VENC>;
clock-names = "jpgenc";
power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>;
- mediatek,larb = <&larb2>;
iommus = <&iommu MT2701_M4U_PORT_JPGENC_RDMA>,
<&iommu MT2701_M4U_PORT_JPGENC_BSDMA>;
};
diff --git a/Documentation/devicetree/bindings/media/mediatek-mdp.txt b/Documentation/devicetree/bindings/media/mediatek-mdp.txt
index f4798d04e925..df69c5a06250 100644
--- a/Documentation/devicetree/bindings/media/mediatek-mdp.txt
+++ b/Documentation/devicetree/bindings/media/mediatek-mdp.txt
@@ -27,9 +27,6 @@ Required properties (DMA function blocks, child node):
- iommus: should point to the respective IOMMU block with master port as
argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
for details.
-- mediatek,larb: must contain the local arbiters in the current Socs, see
- Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml
- for details.
Example:
mdp_rdma0: rdma@14001000 {
@@ -40,7 +37,6 @@ Example:
<&mmsys CLK_MM_MUTEX_32K>;
power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
iommus = <&iommu M4U_PORT_MDP_RDMA0>;
- mediatek,larb = <&larb0>;
mediatek,vpu = <&vpu>;
};
@@ -51,7 +47,6 @@ Example:
<&mmsys CLK_MM_MUTEX_32K>;
power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
iommus = <&iommu M4U_PORT_MDP_RDMA1>;
- mediatek,larb = <&larb4>;
};
mdp_rsz0: rsz@14003000 {
@@ -81,7 +76,6 @@ Example:
clocks = <&mmsys CLK_MM_MDP_WDMA>;
power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
iommus = <&iommu M4U_PORT_MDP_WDMA>;
- mediatek,larb = <&larb0>;
};
mdp_wrot0: wrot@14007000 {
@@ -90,7 +84,6 @@ Example:
clocks = <&mmsys CLK_MM_MDP_WROT0>;
power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
iommus = <&iommu M4U_PORT_MDP_WROT0>;
- mediatek,larb = <&larb0>;
};
mdp_wrot1: wrot@14008000 {
@@ -99,5 +92,4 @@ Example:
clocks = <&mmsys CLK_MM_MDP_WROT1>;
power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
iommus = <&iommu M4U_PORT_MDP_WROT1>;
- mediatek,larb = <&larb4>;
};
diff --git a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
index 8318f0ed492d..ad7ba4bf23fe 100644
--- a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
+++ b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
@@ -12,7 +12,6 @@ Required properties:
- reg : Physical base address of the video codec registers and length of
memory mapped region.
- interrupts : interrupt number to the cpu.
-- mediatek,larb : must contain the local arbiters in the current Socs.
- clocks : list of clock specifiers, corresponding to entries in
the clock-names property.
- clock-names: avc encoder must contain "venc_sel", vp8 encoder must
@@ -44,7 +43,6 @@ vcodec_dec: vcodec@16000000 {
<0 0x16027800 0 0x800>, /*VP8_VL*/
<0 0x16028400 0 0x400>; /*VP9_VD*/
interrupts = <GIC_SPI 204 IRQ_TYPE_LEVEL_LOW>;
- mediatek,larb = <&larb1>;
iommus = <&iommu M4U_PORT_HW_VDEC_MC_EXT>,
<&iommu M4U_PORT_HW_VDEC_PP_EXT>,
<&iommu M4U_PORT_HW_VDEC_AVC_MV_EXT>,
@@ -97,7 +95,6 @@ vcodec_enc_avc: vcodec@18002000 {
<&iommu M4U_PORT_VENC_REF_CHROMA>,
<&iommu M4U_PORT_VENC_NBM_RDMA>,
<&iommu M4U_PORT_VENC_NBM_WDMA>;
- mediatek,larb = <&larb3>;
mediatek,vpu = <&vpu>;
clocks = <&topckgen CLK_TOP_VENC_SEL>;
clock-names = "venc_sel";
@@ -118,7 +115,6 @@ vcodec_enc_vp8: vcodec@19002000 {
<&iommu M4U_PORT_VENC_CUR_CHROMA_SET2>,
<&iommu M4U_PORT_VENC_REF_LUMA_SET2>,
<&iommu M4U_PORT_VENC_REC_CHROMA_SET2>;
- mediatek,larb = <&larb5>;
mediatek,vpu = <&vpu>;
clocks = <&topckgen CLK_TOP_VENC_LT_SEL>;
clock-names = "venc_lt_sel";
--
2.18.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v5 02/16] iommu/mediatek: Add probe_defer for smi-larb
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
2021-04-10 9:11 ` [PATCH v5 01/16] dt-binding: mediatek: Get rid of mediatek,larb for multimedia HW Yong Wu
@ 2021-04-10 9:11 ` Yong Wu
2021-04-10 9:11 ` [PATCH v5 03/16] iommu/mediatek: Add device_link between the consumer and the larb devices Yong Wu
` (14 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Yong Wu @ 2021-04-10 9:11 UTC (permalink / raw)
To: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, yong.wu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot
The iommu consumer should use device_link to connect with the
smi-larb(supplier). then the smi-larb should run before the iommu
consumer. Here we delay the iommu driver until the smi driver is
ready, then all the iommu consumer always is after the smi driver.
When there is no this patch, if some consumer drivers run before
smi-larb, the supplier link_status is DL_DEV_NO_DRIVER(0) in the
device_link_add, then device_links_driver_bound will use WARN_ON
to complain that the link_status of supplier is not right.
This is a preparing patch for adding device_link.
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
To Matthias,
In v2, You suggested use device_is_bound here. But from [1], this
interface is not allowed to be EXPORT. It will affect this driver
built as module. thus I still use dev.driver to check here.
[1] https://lore.kernel.org/patchwork/patch/1334670/
---
drivers/iommu/mtk_iommu.c | 2 +-
drivers/iommu/mtk_iommu_v1.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 6ecc007f07cd..7a7b8260d308 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -862,7 +862,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)
id = i;
plarbdev = of_find_device_by_node(larbnode);
- if (!plarbdev) {
+ if (!plarbdev || !plarbdev->dev.driver) {
of_node_put(larbnode);
return -EPROBE_DEFER;
}
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index 82ddfe9170d4..a82466e4046e 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -597,7 +597,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)
plarbdev = of_platform_device_create(
larb_spec.np, NULL,
platform_bus_type.dev_root);
- if (!plarbdev) {
+ if (!plarbdev || !plarbdev->dev.driver) {
of_node_put(larb_spec.np);
return -EPROBE_DEFER;
}
--
2.18.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v5 03/16] iommu/mediatek: Add device_link between the consumer and the larb devices
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
2021-04-10 9:11 ` [PATCH v5 01/16] dt-binding: mediatek: Get rid of mediatek,larb for multimedia HW Yong Wu
2021-04-10 9:11 ` [PATCH v5 02/16] iommu/mediatek: Add probe_defer for smi-larb Yong Wu
@ 2021-04-10 9:11 ` Yong Wu
2021-04-10 9:11 ` [PATCH v5 04/16] memory: mtk-smi: Add device-link between smi-larb and smi-common Yong Wu
` (13 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Yong Wu @ 2021-04-10 9:11 UTC (permalink / raw)
To: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, yong.wu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot
MediaTek IOMMU-SMI diagram is like below. all the consumer connect with
smi-larb, then connect with smi-common.
M4U
|
smi-common
|
-------------
| | ...
| |
larb1 larb2
| |
vdec venc
When the consumer works, it should enable the smi-larb's power which
also need enable the smi-common's power firstly.
Thus, First of all, use the device link connect the consumer and the
smi-larbs. then add device link between the smi-larb and smi-common.
This patch adds device_link between the consumer and the larbs.
When device_link_add, I add the flag DL_FLAG_STATELESS to avoid calling
pm_runtime_xx to keep the original status of clocks. It can avoid two
issues:
1) Display HW show fastlogo abnormally reported in [1]. At the beggining,
all the clocks are enabled before entering kernel, but the clocks for
display HW(always in larb0) will be gated after clk_enable and clk_disable
called from device_link_add(->pm_runtime_resume) and rpm_idle. The clock
operation happened before display driver probe. At that time, the display
HW will be abnormal.
2) A deadlock issue reported in [2]. Use DL_FLAG_STATELESS to skip
pm_runtime_xx to avoid the deadlock.
Corresponding, DL_FLAG_AUTOREMOVE_CONSUMER can't be added, then
device_link_removed should be added explicitly.
[1] https://lore.kernel.org/linux-mediatek/1564213888.22908.4.camel@mhfsdcap03/
[2] https://lore.kernel.org/patchwork/patch/1086569/
Suggested-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/iommu/mtk_iommu.c | 22 ++++++++++++++++++++++
drivers/iommu/mtk_iommu_v1.c | 20 +++++++++++++++++++-
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 7a7b8260d308..cd054bd3f0df 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -571,22 +571,44 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct mtk_iommu_data *data;
+ struct device_link *link;
+ struct device *larbdev;
+ unsigned int larbid;
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
return ERR_PTR(-ENODEV); /* Not a iommu client device */
data = dev_iommu_priv_get(dev);
+ /*
+ * Link the consumer device with the smi-larb device(supplier)
+ * The device in each a larb is a independent HW. thus only link
+ * one larb here.
+ */
+ larbid = MTK_M4U_TO_LARB(fwspec->ids[0]);
+ larbdev = data->larb_imu[larbid].dev;
+ link = device_link_add(dev, larbdev,
+ DL_FLAG_PM_RUNTIME | DL_FLAG_STATELESS);
+ if (!link)
+ dev_err(dev, "Unable to link %s\n", dev_name(larbdev));
return &data->iommu;
}
static void mtk_iommu_release_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
+ struct mtk_iommu_data *data;
+ struct device *larbdev;
+ unsigned int larbid;
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
return;
+ data = dev_iommu_priv_get(dev);
+ larbid = MTK_M4U_TO_LARB(fwspec->ids[0]);
+ larbdev = data->larb_imu[larbid].dev;
+ device_link_remove(dev, larbdev);
+
iommu_fwspec_free(dev);
}
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index a82466e4046e..43dbdf692894 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -425,7 +425,9 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
struct of_phandle_args iommu_spec;
struct of_phandle_iterator it;
struct mtk_iommu_data *data;
- int err;
+ struct device_link *link;
+ struct device *larbdev;
+ int err, larbid;
of_for_each_phandle(&it, err, dev->of_node, "iommus",
"#iommu-cells", -1) {
@@ -447,6 +449,14 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
data = dev_iommu_priv_get(dev);
+ /* Link the consumer device with the smi-larb device(supplier) */
+ larbid = mt2701_m4u_to_larb(fwspec->ids[0]);
+ larbdev = data->larb_imu[larbid].dev;
+ link = device_link_add(dev, larbdev,
+ DL_FLAG_PM_RUNTIME | DL_FLAG_STATELESS);
+ if (!link)
+ dev_err(dev, "Unable to link %s\n", dev_name(larbdev));
+
return &data->iommu;
}
@@ -467,10 +477,18 @@ static void mtk_iommu_probe_finalize(struct device *dev)
static void mtk_iommu_release_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
+ struct mtk_iommu_data *data;
+ struct device *larbdev;
+ unsigned int larbid;
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
return;
+ data = dev_iommu_priv_get(dev);
+ larbid = mt2701_m4u_to_larb(fwspec->ids[0]);
+ larbdev = data->larb_imu[larbid].dev;
+ device_link_remove(dev, larbdev);
+
iommu_fwspec_free(dev);
}
--
2.18.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v5 04/16] memory: mtk-smi: Add device-link between smi-larb and smi-common
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
` (2 preceding siblings ...)
2021-04-10 9:11 ` [PATCH v5 03/16] iommu/mediatek: Add device_link between the consumer and the larb devices Yong Wu
@ 2021-04-10 9:11 ` Yong Wu
2021-04-10 12:40 ` Krzysztof Kozlowski
2021-04-10 9:11 ` [PATCH v5 05/16] media: mtk-jpeg: Use pm_runtime_resume_and_get for PM get_sync Yong Wu
` (12 subsequent siblings)
16 siblings, 1 reply; 34+ messages in thread
From: Yong Wu @ 2021-04-10 9:11 UTC (permalink / raw)
To: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, yong.wu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot
Normally, If the smi-larb HW need work, we should enable the smi-common
HW power and clock firstly.
This patch adds device-link between the smi-larb dev and the smi-common
dev. then If pm_runtime_get_sync(smi-larb-dev), the pm_runtime_get_sync
(smi-common-dev) will be called automatically.
Also, Add DL_FLAG_STATELESS to avoid the smi-common clocks be gated when
probe.
CC: Matthias Brugger <matthias.bgg@gmail.com>
Suggested-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/memory/mtk-smi.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
index b396253fcf4b..c5fb51f73b34 100644
--- a/drivers/memory/mtk-smi.c
+++ b/drivers/memory/mtk-smi.c
@@ -319,6 +319,7 @@ static int mtk_smi_larb_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct device_node *smi_node;
struct platform_device *smi_pdev;
+ struct device_link *link;
larb = devm_kzalloc(dev, sizeof(*larb), GFP_KERNEL);
if (!larb)
@@ -358,6 +359,12 @@ static int mtk_smi_larb_probe(struct platform_device *pdev)
if (!platform_get_drvdata(smi_pdev))
return -EPROBE_DEFER;
larb->smi_common_dev = &smi_pdev->dev;
+ link = device_link_add(dev, larb->smi_common_dev,
+ DL_FLAG_PM_RUNTIME | DL_FLAG_STATELESS);
+ if (!link) {
+ dev_err(dev, "Unable to link smi-common dev\n");
+ return -ENODEV;
+ }
} else {
dev_err(dev, "Failed to get the smi_common device\n");
return -EINVAL;
@@ -370,6 +377,9 @@ static int mtk_smi_larb_probe(struct platform_device *pdev)
static int mtk_smi_larb_remove(struct platform_device *pdev)
{
+ struct mtk_smi_larb *larb = platform_get_drvdata(pdev);
+
+ device_link_remove(&pdev->dev, larb->smi_common_dev);
pm_runtime_disable(&pdev->dev);
component_del(&pdev->dev, &mtk_smi_larb_component_ops);
return 0;
@@ -381,17 +391,9 @@ static int __maybe_unused mtk_smi_larb_resume(struct device *dev)
const struct mtk_smi_larb_gen *larb_gen = larb->larb_gen;
int ret;
- /* Power on smi-common. */
- ret = pm_runtime_resume_and_get(larb->smi_common_dev);
- if (ret < 0) {
- dev_err(dev, "Failed to pm get for smi-common(%d).\n", ret);
- return ret;
- }
-
ret = mtk_smi_clk_enable(&larb->smi);
if (ret < 0) {
dev_err(dev, "Failed to enable clock(%d).\n", ret);
- pm_runtime_put_sync(larb->smi_common_dev);
return ret;
}
@@ -406,7 +408,6 @@ static int __maybe_unused mtk_smi_larb_suspend(struct device *dev)
struct mtk_smi_larb *larb = dev_get_drvdata(dev);
mtk_smi_clk_disable(&larb->smi);
- pm_runtime_put_sync(larb->smi_common_dev);
return 0;
}
--
2.18.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v5 04/16] memory: mtk-smi: Add device-link between smi-larb and smi-common
2021-04-10 9:11 ` [PATCH v5 04/16] memory: mtk-smi: Add device-link between smi-larb and smi-common Yong Wu
@ 2021-04-10 12:40 ` Krzysztof Kozlowski
2021-04-13 6:04 ` Yong Wu
0 siblings, 1 reply; 34+ messages in thread
From: Krzysztof Kozlowski @ 2021-04-10 12:40 UTC (permalink / raw)
To: Yong Wu, Matthias Brugger, Joerg Roedel, Rob Herring
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot
On 10/04/2021 11:11, Yong Wu wrote:
> Normally, If the smi-larb HW need work, we should enable the smi-common
> HW power and clock firstly.
> This patch adds device-link between the smi-larb dev and the smi-common
> dev. then If pm_runtime_get_sync(smi-larb-dev), the pm_runtime_get_sync
> (smi-common-dev) will be called automatically.
>
> Also, Add DL_FLAG_STATELESS to avoid the smi-common clocks be gated when
> probe.
>
> CC: Matthias Brugger <matthias.bgg@gmail.com>
> Suggested-by: Tomasz Figa <tfiga@chromium.org>
> Signed-off-by: Yong Wu <yong.wu@mediatek.com>
> ---
> drivers/memory/mtk-smi.c | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
I understood this is a dependency for other patches, so:
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
If I am wrong and I can take it via memory tree, let me know.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v5 04/16] memory: mtk-smi: Add device-link between smi-larb and smi-common
2021-04-10 12:40 ` Krzysztof Kozlowski
@ 2021-04-13 6:04 ` Yong Wu
2021-04-13 14:58 ` Krzysztof Kozlowski
0 siblings, 1 reply; 34+ messages in thread
From: Yong Wu @ 2021-04-13 6:04 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Matthias Brugger, Joerg Roedel, Rob Herring, Evan Green,
Robin Murphy, Tomasz Figa, Will Deacon, linux-mediatek,
srv_heupstream, devicetree, linux-kernel, linux-arm-kernel,
iommu, youlin.pei, Nicolas Boichat, Matthias Kaehlcke, anan.sun,
chao.hao, ming-fan.chen, yi.kuo, eizan, acourbot
On Sat, 2021-04-10 at 14:40 +0200, Krzysztof Kozlowski wrote:
> On 10/04/2021 11:11, Yong Wu wrote:
> > Normally, If the smi-larb HW need work, we should enable the smi-common
> > HW power and clock firstly.
> > This patch adds device-link between the smi-larb dev and the smi-common
> > dev. then If pm_runtime_get_sync(smi-larb-dev), the pm_runtime_get_sync
> > (smi-common-dev) will be called automatically.
> >
> > Also, Add DL_FLAG_STATELESS to avoid the smi-common clocks be gated when
> > probe.
> >
> > CC: Matthias Brugger <matthias.bgg@gmail.com>
> > Suggested-by: Tomasz Figa <tfiga@chromium.org>
> > Signed-off-by: Yong Wu <yong.wu@mediatek.com>
> > ---
> > drivers/memory/mtk-smi.c | 19 ++++++++++---------
> > 1 file changed, 10 insertions(+), 9 deletions(-)
>
> I understood this is a dependency for other patches, so:
> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>
> If I am wrong and I can take it via memory tree, let me know.
Hi Krzysztof,
Thanks very much for your quickly review.
I think it is ok if it go through memory tree. In the original patch, we
pm_runtime_get(smi-common-dev) in the smi-larb's pm resume callback.
This patch only use device-link do this. thus, this patch have no
function change. it only adjusts the SMI internal code flow.
In addition, [14/16] expects your Acked-by. and that one should be
merged with the others.
About the others patches, I'm not sure which tree they should go
through. they cross several trees, dt-binding/iommu/media/drm/dts.
Not sure if Matthias could have time to review and give some suggestion.
>
> Best regards,
> Krzysztof
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v5 04/16] memory: mtk-smi: Add device-link between smi-larb and smi-common
2021-04-13 6:04 ` Yong Wu
@ 2021-04-13 14:58 ` Krzysztof Kozlowski
0 siblings, 0 replies; 34+ messages in thread
From: Krzysztof Kozlowski @ 2021-04-13 14:58 UTC (permalink / raw)
To: Yong Wu
Cc: Matthias Brugger, Joerg Roedel, Rob Herring, Evan Green,
Robin Murphy, Tomasz Figa, Will Deacon, linux-mediatek,
srv_heupstream, devicetree, linux-kernel, linux-arm-kernel,
iommu, youlin.pei, Nicolas Boichat, Matthias Kaehlcke, anan.sun,
chao.hao, ming-fan.chen, yi.kuo, eizan, acourbot
On 13/04/2021 08:04, Yong Wu wrote:
> On Sat, 2021-04-10 at 14:40 +0200, Krzysztof Kozlowski wrote:
>> On 10/04/2021 11:11, Yong Wu wrote:
>>> Normally, If the smi-larb HW need work, we should enable the smi-common
>>> HW power and clock firstly.
>>> This patch adds device-link between the smi-larb dev and the smi-common
>>> dev. then If pm_runtime_get_sync(smi-larb-dev), the pm_runtime_get_sync
>>> (smi-common-dev) will be called automatically.
>>>
>>> Also, Add DL_FLAG_STATELESS to avoid the smi-common clocks be gated when
>>> probe.
>>>
>>> CC: Matthias Brugger <matthias.bgg@gmail.com>
>>> Suggested-by: Tomasz Figa <tfiga@chromium.org>
>>> Signed-off-by: Yong Wu <yong.wu@mediatek.com>
>>> ---
>>> drivers/memory/mtk-smi.c | 19 ++++++++++---------
>>> 1 file changed, 10 insertions(+), 9 deletions(-)
>>
>> I understood this is a dependency for other patches, so:
>> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>>
>> If I am wrong and I can take it via memory tree, let me know.
>
> Hi Krzysztof,
>
> Thanks very much for your quickly review.
>
> I think it is ok if it go through memory tree. In the original patch, we
> pm_runtime_get(smi-common-dev) in the smi-larb's pm resume callback.
> This patch only use device-link do this. thus, this patch have no
> function change. it only adjusts the SMI internal code flow.
Hm, okay, I took it then for v5.13.
>
> In addition, [14/16] expects your Acked-by. and that one should be
> merged with the others.
Thanks for reminder.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v5 05/16] media: mtk-jpeg: Use pm_runtime_resume_and_get for PM get_sync
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
` (3 preceding siblings ...)
2021-04-10 9:11 ` [PATCH v5 04/16] memory: mtk-smi: Add device-link between smi-larb and smi-common Yong Wu
@ 2021-04-10 9:11 ` Yong Wu
2021-06-09 13:38 ` Matthias Brugger
2021-04-10 9:11 ` [PATCH v5 06/16] media: mtk-jpeg: Get rid of mtk_smi_larb_get/put Yong Wu
` (11 subsequent siblings)
16 siblings, 1 reply; 34+ messages in thread
From: Yong Wu @ 2021-04-10 9:11 UTC (permalink / raw)
To: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, yong.wu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot, Xia Jiang
pm_runtime_get_sync will increment pm usage counter even it failed.
This patch use pm_runtime_resume_and_get instead of pm_runtime_get
to keep usage counter balanced.
CC: Xia Jiang <xia.jiang@mediatek.com>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
index 88a23bce569d..a89c7b206eef 100644
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
@@ -920,7 +920,7 @@ static void mtk_jpeg_enc_device_run(void *priv)
src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
- ret = pm_runtime_get_sync(jpeg->dev);
+ ret = pm_runtime_resume_and_get(jpeg->dev);
if (ret < 0)
goto enc_end;
@@ -973,7 +973,7 @@ static void mtk_jpeg_dec_device_run(void *priv)
return;
}
- ret = pm_runtime_get_sync(jpeg->dev);
+ ret = pm_runtime_resume_and_get(jpeg->dev);
if (ret < 0)
goto dec_end;
--
2.18.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v5 05/16] media: mtk-jpeg: Use pm_runtime_resume_and_get for PM get_sync
2021-04-10 9:11 ` [PATCH v5 05/16] media: mtk-jpeg: Use pm_runtime_resume_and_get for PM get_sync Yong Wu
@ 2021-06-09 13:38 ` Matthias Brugger
0 siblings, 0 replies; 34+ messages in thread
From: Matthias Brugger @ 2021-06-09 13:38 UTC (permalink / raw)
To: Yong Wu, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot, Xia Jiang
On 10/04/2021 11:11, Yong Wu wrote:
> pm_runtime_get_sync will increment pm usage counter even it failed.
> This patch use pm_runtime_resume_and_get instead of pm_runtime_get
> to keep usage counter balanced.
>
> CC: Xia Jiang <xia.jiang@mediatek.com>
> Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
> ---
> drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
> index 88a23bce569d..a89c7b206eef 100644
> --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
> +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
> @@ -920,7 +920,7 @@ static void mtk_jpeg_enc_device_run(void *priv)
> src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
> dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
>
> - ret = pm_runtime_get_sync(jpeg->dev);
> + ret = pm_runtime_resume_and_get(jpeg->dev);
> if (ret < 0)
> goto enc_end;
>
> @@ -973,7 +973,7 @@ static void mtk_jpeg_dec_device_run(void *priv)
> return;
> }
>
> - ret = pm_runtime_get_sync(jpeg->dev);
> + ret = pm_runtime_resume_and_get(jpeg->dev);
> if (ret < 0)
> goto dec_end;
>
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v5 06/16] media: mtk-jpeg: Get rid of mtk_smi_larb_get/put
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
` (4 preceding siblings ...)
2021-04-10 9:11 ` [PATCH v5 05/16] media: mtk-jpeg: Use pm_runtime_resume_and_get for PM get_sync Yong Wu
@ 2021-04-10 9:11 ` Yong Wu
2021-04-10 9:11 ` [PATCH v5 07/16] media: mtk-mdp: Use pm_runtime_resume_and_get for PM get_sync Yong Wu
` (10 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Yong Wu @ 2021-04-10 9:11 UTC (permalink / raw)
To: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, yong.wu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot, Rick Chang, Xia Jiang
MediaTek IOMMU has already added device_link between the consumer
and smi-larb device. If the jpg device call the pm_runtime_get_sync,
the smi-larb's pm_runtime_get_sync also be called automatically.
CC: Rick Chang <rick.chang@mediatek.com>
CC: Xia Jiang <xia.jiang@mediatek.com>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Evan Green <evgreen@chromium.org>
Acked-by: Rick Chang <rick.chang@mediatek.com>
---
.../media/platform/mtk-jpeg/mtk_jpeg_core.c | 30 +------------------
.../media/platform/mtk-jpeg/mtk_jpeg_core.h | 2 --
2 files changed, 1 insertion(+), 31 deletions(-)
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
index a89c7b206eef..a47832a1b316 100644
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
@@ -22,7 +22,6 @@
#include <media/v4l2-ioctl.h>
#include <media/videobuf2-core.h>
#include <media/videobuf2-dma-contig.h>
-#include <soc/mediatek/smi.h>
#include "mtk_jpeg_enc_hw.h"
#include "mtk_jpeg_dec_hw.h"
@@ -1055,10 +1054,6 @@ static void mtk_jpeg_clk_on(struct mtk_jpeg_dev *jpeg)
{
int ret;
- ret = mtk_smi_larb_get(jpeg->larb);
- if (ret)
- dev_err(jpeg->dev, "mtk_smi_larb_get larbvdec fail %d\n", ret);
-
ret = clk_bulk_prepare_enable(jpeg->variant->num_clks,
jpeg->variant->clks);
if (ret)
@@ -1069,7 +1064,6 @@ static void mtk_jpeg_clk_off(struct mtk_jpeg_dev *jpeg)
{
clk_bulk_disable_unprepare(jpeg->variant->num_clks,
jpeg->variant->clks);
- mtk_smi_larb_put(jpeg->larb);
}
static irqreturn_t mtk_jpeg_enc_done(struct mtk_jpeg_dev *jpeg)
@@ -1286,27 +1280,12 @@ static struct clk_bulk_data mtk_jpeg_clocks[] = {
static int mtk_jpeg_clk_init(struct mtk_jpeg_dev *jpeg)
{
- struct device_node *node;
- struct platform_device *pdev;
int ret;
- node = of_parse_phandle(jpeg->dev->of_node, "mediatek,larb", 0);
- if (!node)
- return -EINVAL;
- pdev = of_find_device_by_node(node);
- if (WARN_ON(!pdev)) {
- of_node_put(node);
- return -EINVAL;
- }
- of_node_put(node);
-
- jpeg->larb = &pdev->dev;
-
ret = devm_clk_bulk_get(jpeg->dev, jpeg->variant->num_clks,
jpeg->variant->clks);
if (ret) {
- dev_err(&pdev->dev, "failed to get jpeg clock:%d\n", ret);
- put_device(&pdev->dev);
+ dev_err(jpeg->dev, "failed to get jpeg clock:%d\n", ret);
return ret;
}
@@ -1333,11 +1312,6 @@ static void mtk_jpeg_job_timeout_work(struct work_struct *work)
v4l2_m2m_job_finish(jpeg->m2m_dev, ctx->fh.m2m_ctx);
}
-static inline void mtk_jpeg_clk_release(struct mtk_jpeg_dev *jpeg)
-{
- put_device(jpeg->larb);
-}
-
static int mtk_jpeg_probe(struct platform_device *pdev)
{
struct mtk_jpeg_dev *jpeg;
@@ -1442,7 +1416,6 @@ static int mtk_jpeg_probe(struct platform_device *pdev)
v4l2_device_unregister(&jpeg->v4l2_dev);
err_dev_register:
- mtk_jpeg_clk_release(jpeg);
err_clk_init:
@@ -1460,7 +1433,6 @@ static int mtk_jpeg_remove(struct platform_device *pdev)
video_device_release(jpeg->vdev);
v4l2_m2m_release(jpeg->m2m_dev);
v4l2_device_unregister(&jpeg->v4l2_dev);
- mtk_jpeg_clk_release(jpeg);
return 0;
}
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
index 68e634f02e00..6e558e97a2d8 100644
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
@@ -85,7 +85,6 @@ struct mtk_jpeg_variant {
* @alloc_ctx: videobuf2 memory allocator's context
* @vdev: video device node for jpeg mem2mem mode
* @reg_base: JPEG registers mapping
- * @larb: SMI device
* @job_timeout_work: IRQ timeout structure
* @variant: driver variant to be used
*/
@@ -99,7 +98,6 @@ struct mtk_jpeg_dev {
void *alloc_ctx;
struct video_device *vdev;
void __iomem *reg_base;
- struct device *larb;
struct delayed_work job_timeout_work;
const struct mtk_jpeg_variant *variant;
};
--
2.18.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v5 07/16] media: mtk-mdp: Use pm_runtime_resume_and_get for PM get_sync
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
` (5 preceding siblings ...)
2021-04-10 9:11 ` [PATCH v5 06/16] media: mtk-jpeg: Get rid of mtk_smi_larb_get/put Yong Wu
@ 2021-04-10 9:11 ` Yong Wu
2021-04-10 9:11 ` [PATCH v5 08/16] media: mtk-mdp: Get rid of mtk_smi_larb_get/put Yong Wu
` (9 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Yong Wu @ 2021-04-10 9:11 UTC (permalink / raw)
To: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, yong.wu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot
pm_runtime_get_sync will increment pm usage counter even it failed.
This patch use pm_runtime_resume_and_get instead of pm_runtime_get
to keep usage counter balanced.
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
index ace4528cdc5e..93c9df15084a 100644
--- a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
+++ b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
@@ -391,9 +391,9 @@ static int mtk_mdp_m2m_start_streaming(struct vb2_queue *q, unsigned int count)
struct mtk_mdp_ctx *ctx = q->drv_priv;
int ret;
- ret = pm_runtime_get_sync(&ctx->mdp_dev->pdev->dev);
+ ret = pm_runtime_resume_and_get(&ctx->mdp_dev->pdev->dev);
if (ret < 0)
- mtk_mdp_dbg(1, "[%d] pm_runtime_get_sync failed:%d",
+ mtk_mdp_dbg(1, "[%d] pm_runtime_resume_and_get failed:%d",
ctx->id, ret);
return 0;
--
2.18.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v5 08/16] media: mtk-mdp: Get rid of mtk_smi_larb_get/put
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
` (6 preceding siblings ...)
2021-04-10 9:11 ` [PATCH v5 07/16] media: mtk-mdp: Use pm_runtime_resume_and_get for PM get_sync Yong Wu
@ 2021-04-10 9:11 ` Yong Wu
2021-06-08 9:35 ` houlong wei
2021-04-10 9:11 ` [PATCH v5 09/16] drm/mediatek: Use pm_runtime_resume_and_get for PM get_sync Yong Wu
` (8 subsequent siblings)
16 siblings, 1 reply; 34+ messages in thread
From: Yong Wu @ 2021-04-10 9:11 UTC (permalink / raw)
To: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, yong.wu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot, Minghsiu Tsai, Houlong Wei
MediaTek IOMMU has already added the device_link between the consumer
and smi-larb device. If the mdp device call the pm_runtime_get_sync,
the smi-larb's pm_runtime_get_sync also be called automatically.
CC: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
CC: Houlong Wei <houlong.wei@mediatek.com>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Evan Green <evgreen@chromium.org>
---
drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 40 -------------------
drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 2 -
drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 1 -
3 files changed, 43 deletions(-)
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
index b3426a551bea..1e3833f1c9ae 100644
--- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
+++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
@@ -9,7 +9,6 @@
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_platform.h>
-#include <soc/mediatek/smi.h>
#include "mtk_mdp_comp.h"
@@ -18,14 +17,6 @@ void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp)
{
int i, err;
- if (comp->larb_dev) {
- err = mtk_smi_larb_get(comp->larb_dev);
- if (err)
- dev_err(dev,
- "failed to get larb, err %d. type:%d\n",
- err, comp->type);
- }
-
for (i = 0; i < ARRAY_SIZE(comp->clk); i++) {
if (IS_ERR(comp->clk[i]))
continue;
@@ -46,17 +37,12 @@ void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp)
continue;
clk_disable_unprepare(comp->clk[i]);
}
-
- if (comp->larb_dev)
- mtk_smi_larb_put(comp->larb_dev);
}
int mtk_mdp_comp_init(struct device *dev, struct device_node *node,
struct mtk_mdp_comp *comp,
enum mtk_mdp_comp_type comp_type)
{
- struct device_node *larb_node;
- struct platform_device *larb_pdev;
int ret;
int i;
@@ -77,32 +63,6 @@ int mtk_mdp_comp_init(struct device *dev, struct device_node *node,
break;
}
- /* Only DMA capable components need the LARB property */
- comp->larb_dev = NULL;
- if (comp->type != MTK_MDP_RDMA &&
- comp->type != MTK_MDP_WDMA &&
- comp->type != MTK_MDP_WROT)
- return 0;
-
- larb_node = of_parse_phandle(node, "mediatek,larb", 0);
- if (!larb_node) {
- dev_err(dev,
- "Missing mediadek,larb phandle in %pOF node\n", node);
- ret = -EINVAL;
- goto put_dev;
- }
-
- larb_pdev = of_find_device_by_node(larb_node);
- if (!larb_pdev) {
- dev_warn(dev, "Waiting for larb device %pOF\n", larb_node);
- of_node_put(larb_node);
- ret = -EPROBE_DEFER;
- goto put_dev;
- }
- of_node_put(larb_node);
-
- comp->larb_dev = &larb_pdev->dev;
-
return 0;
put_dev:
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
index 1bf0242cce46..36bc1b8f6222 100644
--- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
+++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
@@ -27,14 +27,12 @@ enum mtk_mdp_comp_type {
* @node: list node to track sibing MDP components
* @dev_node: component device node
* @clk: clocks required for component
- * @larb_dev: SMI device required for component
* @type: component type
*/
struct mtk_mdp_comp {
struct list_head node;
struct device_node *dev_node;
struct clk *clk[2];
- struct device *larb_dev;
enum mtk_mdp_comp_type type;
};
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
index 976aa1f4829b..70a8eab16863 100644
--- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
+++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
@@ -17,7 +17,6 @@
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/workqueue.h>
-#include <soc/mediatek/smi.h>
#include "mtk_mdp_core.h"
#include "mtk_mdp_m2m.h"
--
2.18.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v5 08/16] media: mtk-mdp: Get rid of mtk_smi_larb_get/put
2021-04-10 9:11 ` [PATCH v5 08/16] media: mtk-mdp: Get rid of mtk_smi_larb_get/put Yong Wu
@ 2021-06-08 9:35 ` houlong wei
0 siblings, 0 replies; 34+ messages in thread
From: houlong wei @ 2021-06-08 9:35 UTC (permalink / raw)
To: Yong Wu
Cc: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski,
Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, Youlin Pei (裴友林),
Nicolas Boichat, Matthias Kaehlcke,
Anan Sun (孙安安), Chao Hao (郝超),
Ming-Fan Chen (陳明汎),
Yi Kuo (郭懿),
eizan, acourbot, Minghsiu Tsai (蔡明修)
On Sat, 2021-04-10 at 17:11 +0800, Yong Wu wrote:
> MediaTek IOMMU has already added the device_link between the consumer
> and smi-larb device. If the mdp device call the pm_runtime_get_sync,
> the smi-larb's pm_runtime_get_sync also be called automatically.
>
> CC: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
> CC: Houlong Wei <houlong.wei@mediatek.com>
> Signed-off-by: Yong Wu <yong.wu@mediatek.com>
> Reviewed-by: Evan Green <evgreen@chromium.org>
> ---
> drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 40 -------------------
> drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 2 -
> drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 1 -
> 3 files changed, 43 deletions(-)
>
> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
> index b3426a551bea..1e3833f1c9ae 100644
> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
> @@ -9,7 +9,6 @@
> #include <linux/of.h>
> #include <linux/of_address.h>
> #include <linux/of_platform.h>
> -#include <soc/mediatek/smi.h>
>
> #include "mtk_mdp_comp.h"
>
> @@ -18,14 +17,6 @@ void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp)
> {
> int i, err;
>
> - if (comp->larb_dev) {
> - err = mtk_smi_larb_get(comp->larb_dev);
> - if (err)
> - dev_err(dev,
> - "failed to get larb, err %d. type:%d\n",
> - err, comp->type);
> - }
> -
> for (i = 0; i < ARRAY_SIZE(comp->clk); i++) {
> if (IS_ERR(comp->clk[i]))
> continue;
> @@ -46,17 +37,12 @@ void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp)
> continue;
> clk_disable_unprepare(comp->clk[i]);
> }
> -
> - if (comp->larb_dev)
> - mtk_smi_larb_put(comp->larb_dev);
> }
>
> int mtk_mdp_comp_init(struct device *dev, struct device_node *node,
> struct mtk_mdp_comp *comp,
> enum mtk_mdp_comp_type comp_type)
> {
> - struct device_node *larb_node;
> - struct platform_device *larb_pdev;
> int ret;
> int i;
>
> @@ -77,32 +63,6 @@ int mtk_mdp_comp_init(struct device *dev, struct device_node *node,
> break;
> }
>
> - /* Only DMA capable components need the LARB property */
> - comp->larb_dev = NULL;
> - if (comp->type != MTK_MDP_RDMA &&
> - comp->type != MTK_MDP_WDMA &&
> - comp->type != MTK_MDP_WROT)
> - return 0;
> -
> - larb_node = of_parse_phandle(node, "mediatek,larb", 0);
> - if (!larb_node) {
> - dev_err(dev,
> - "Missing mediadek,larb phandle in %pOF node\n", node);
> - ret = -EINVAL;
> - goto put_dev;
> - }
> -
> - larb_pdev = of_find_device_by_node(larb_node);
> - if (!larb_pdev) {
> - dev_warn(dev, "Waiting for larb device %pOF\n", larb_node);
> - of_node_put(larb_node);
> - ret = -EPROBE_DEFER;
> - goto put_dev;
> - }
> - of_node_put(larb_node);
> -
> - comp->larb_dev = &larb_pdev->dev;
> -
> return 0;
>
> put_dev:
> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
> index 1bf0242cce46..36bc1b8f6222 100644
> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
> @@ -27,14 +27,12 @@ enum mtk_mdp_comp_type {
> * @node: list node to track sibing MDP components
> * @dev_node: component device node
> * @clk: clocks required for component
> - * @larb_dev: SMI device required for component
> * @type: component type
> */
> struct mtk_mdp_comp {
> struct list_head node;
> struct device_node *dev_node;
> struct clk *clk[2];
> - struct device *larb_dev;
> enum mtk_mdp_comp_type type;
> };
>
> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> index 976aa1f4829b..70a8eab16863 100644
> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> @@ -17,7 +17,6 @@
> #include <linux/platform_device.h>
> #include <linux/pm_runtime.h>
> #include <linux/workqueue.h>
> -#include <soc/mediatek/smi.h>
>
> #include "mtk_mdp_core.h"
> #include "mtk_mdp_m2m.h"
Reviewed-by: Houlong Wei <houlong.wei@mediatek.com>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v5 09/16] drm/mediatek: Use pm_runtime_resume_and_get for PM get_sync
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
` (7 preceding siblings ...)
2021-04-10 9:11 ` [PATCH v5 08/16] media: mtk-mdp: Get rid of mtk_smi_larb_get/put Yong Wu
@ 2021-04-10 9:11 ` Yong Wu
2021-06-09 13:52 ` Matthias Brugger
2021-04-10 9:11 ` [PATCH v5 10/16] drm/mediatek: Add pm runtime support for ovl and rdma Yong Wu
` (7 subsequent siblings)
16 siblings, 1 reply; 34+ messages in thread
From: Yong Wu @ 2021-04-10 9:11 UTC (permalink / raw)
To: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, yong.wu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot
pm_runtime_get_sync will increment pm usage counter even it failed.
This patch use pm_runtime_resume_and_get instead of pm_runtime_get
to keep usage counter balanced.
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 8b0de90156c6..69d23ce56d2c 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -259,7 +259,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
drm_connector_list_iter_end(&conn_iter);
}
- ret = pm_runtime_get_sync(crtc->dev->dev);
+ ret = pm_runtime_resume_and_get(crtc->dev->dev);
if (ret < 0) {
DRM_ERROR("Failed to enable power domain: %d\n", ret);
return ret;
--
2.18.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v5 09/16] drm/mediatek: Use pm_runtime_resume_and_get for PM get_sync
2021-04-10 9:11 ` [PATCH v5 09/16] drm/mediatek: Use pm_runtime_resume_and_get for PM get_sync Yong Wu
@ 2021-06-09 13:52 ` Matthias Brugger
0 siblings, 0 replies; 34+ messages in thread
From: Matthias Brugger @ 2021-06-09 13:52 UTC (permalink / raw)
To: Yong Wu, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot
On 10/04/2021 11:11, Yong Wu wrote:
> pm_runtime_get_sync will increment pm usage counter even it failed.
> This patch use pm_runtime_resume_and_get instead of pm_runtime_get
> to keep usage counter balanced.
>
> Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
> ---
> drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index 8b0de90156c6..69d23ce56d2c 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -259,7 +259,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
> drm_connector_list_iter_end(&conn_iter);
> }
>
> - ret = pm_runtime_get_sync(crtc->dev->dev);
> + ret = pm_runtime_resume_and_get(crtc->dev->dev);
> if (ret < 0) {
> DRM_ERROR("Failed to enable power domain: %d\n", ret);
> return ret;
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v5 10/16] drm/mediatek: Add pm runtime support for ovl and rdma
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
` (8 preceding siblings ...)
2021-04-10 9:11 ` [PATCH v5 09/16] drm/mediatek: Use pm_runtime_resume_and_get for PM get_sync Yong Wu
@ 2021-04-10 9:11 ` Yong Wu
2021-04-10 9:11 ` [PATCH v5 11/16] drm/mediatek: Get rid of mtk_smi_larb_get/put Yong Wu
` (6 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Yong Wu @ 2021-04-10 9:11 UTC (permalink / raw)
To: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, yong.wu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot, Yongqiang Niu, CK Hu
From: Yongqiang Niu <yongqiang.niu@mediatek.com>
Display use the dispsys device to call pm_rumtime_get_sync before.
This patch add pm_runtime_xx with ovl and rdma device whose nodes has
"iommus" property, then display could help pm_runtime_get for smi via
ovl or rdma device.
This is a preparing patch that smi cleaning up "mediatek,larb".
CC: CK Hu <ck.hu@mediatek.com>
Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
(Yong: Use pm_runtime_resume_and_get instead of pm_runtime_get_sync)
Acked-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
---
drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 9 ++++++++-
drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 9 ++++++++-
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 12 +++++++++++-
3 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index 961f87f8d4d1..ee464ccd8a9c 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -11,6 +11,7 @@
#include <linux/of_device.h>
#include <linux/of_irq.h>
#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
#include <linux/soc/mediatek/mtk-cmdq.h>
#include "mtk_disp_drv.h"
@@ -415,15 +416,21 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev)
return ret;
}
+ pm_runtime_enable(dev);
+
ret = component_add(dev, &mtk_disp_ovl_component_ops);
- if (ret)
+ if (ret) {
+ pm_runtime_disable(dev);
dev_err(dev, "Failed to add component: %d\n", ret);
+ }
return ret;
}
static int mtk_disp_ovl_remove(struct platform_device *pdev)
{
+ pm_runtime_disable(&pdev->dev);
+
return 0;
}
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
index 728aaadfea8c..9565f3de773e 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
@@ -9,6 +9,7 @@
#include <linux/of_device.h>
#include <linux/of_irq.h>
#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
#include <linux/soc/mediatek/mtk-cmdq.h>
#include "mtk_disp_drv.h"
@@ -329,9 +330,13 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, priv);
+ pm_runtime_enable(dev);
+
ret = component_add(dev, &mtk_disp_rdma_component_ops);
- if (ret)
+ if (ret) {
+ pm_runtime_disable(dev);
dev_err(dev, "Failed to add component: %d\n", ret);
+ }
return ret;
}
@@ -340,6 +345,8 @@ static int mtk_disp_rdma_remove(struct platform_device *pdev)
{
component_del(&pdev->dev, &mtk_disp_rdma_component_ops);
+ pm_runtime_disable(&pdev->dev);
+
return 0;
}
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 69d23ce56d2c..971ef58ac1dc 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -550,9 +550,15 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
return;
}
+ ret = pm_runtime_resume_and_get(comp->dev);
+ if (ret < 0)
+ DRM_DEV_ERROR(comp->dev, "Failed to enable power domain: %d\n",
+ ret);
+
ret = mtk_crtc_ddp_hw_init(mtk_crtc);
if (ret) {
mtk_smi_larb_put(comp->larb_dev);
+ pm_runtime_put(comp->dev);
return;
}
@@ -565,7 +571,7 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
{
struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
- int i;
+ int i, ret;
DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id);
if (!mtk_crtc->enabled)
@@ -589,6 +595,10 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
drm_crtc_vblank_off(crtc);
mtk_crtc_ddp_hw_fini(mtk_crtc);
mtk_smi_larb_put(comp->larb_dev);
+ ret = pm_runtime_put(comp->dev);
+ if (ret < 0)
+ DRM_DEV_ERROR(comp->dev, "Failed to disable power domain: %d\n",
+ ret);
mtk_crtc->enabled = false;
}
--
2.18.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v5 11/16] drm/mediatek: Get rid of mtk_smi_larb_get/put
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
` (9 preceding siblings ...)
2021-04-10 9:11 ` [PATCH v5 10/16] drm/mediatek: Add pm runtime support for ovl and rdma Yong Wu
@ 2021-04-10 9:11 ` Yong Wu
2021-05-26 5:41 ` Dafna Hirschfeld
2021-04-10 9:11 ` [PATCH v5 12/16] media: mtk-vcodec: Use pm_runtime_resume_and_get for PM get_sync Yong Wu
` (5 subsequent siblings)
16 siblings, 1 reply; 34+ messages in thread
From: Yong Wu @ 2021-04-10 9:11 UTC (permalink / raw)
To: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, yong.wu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot, CK Hu, Philipp Zabel
MediaTek IOMMU has already added the device_link between the consumer
and smi-larb device. If the drm device call the pm_runtime_get_sync,
the smi-larb's pm_runtime_get_sync also be called automatically.
CC: CK Hu <ck.hu@mediatek.com>
CC: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Evan Green <evgreen@chromium.org>
Acked-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
---
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 9 ------
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 35 ---------------------
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 -
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +--
4 files changed, 1 insertion(+), 49 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 971ef58ac1dc..d59353af4019 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -10,7 +10,6 @@
#include <linux/soc/mediatek/mtk-mutex.h>
#include <asm/barrier.h>
-#include <soc/mediatek/smi.h>
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
@@ -544,12 +543,6 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id);
- ret = mtk_smi_larb_get(comp->larb_dev);
- if (ret) {
- DRM_ERROR("Failed to get larb: %d\n", ret);
- return;
- }
-
ret = pm_runtime_resume_and_get(comp->dev);
if (ret < 0)
DRM_DEV_ERROR(comp->dev, "Failed to enable power domain: %d\n",
@@ -557,7 +550,6 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
ret = mtk_crtc_ddp_hw_init(mtk_crtc);
if (ret) {
- mtk_smi_larb_put(comp->larb_dev);
pm_runtime_put(comp->dev);
return;
}
@@ -594,7 +586,6 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
drm_crtc_vblank_off(crtc);
mtk_crtc_ddp_hw_fini(mtk_crtc);
- mtk_smi_larb_put(comp->larb_dev);
ret = pm_runtime_put(comp->dev);
if (ret < 0)
DRM_DEV_ERROR(comp->dev, "Failed to disable power domain: %d\n",
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
index 75bc00e17fc4..6c01492ba4df 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
@@ -449,37 +449,12 @@ unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,
return ret;
}
-static int mtk_ddp_get_larb_dev(struct device_node *node, struct mtk_ddp_comp *comp,
- struct device *dev)
-{
- struct device_node *larb_node;
- struct platform_device *larb_pdev;
-
- larb_node = of_parse_phandle(node, "mediatek,larb", 0);
- if (!larb_node) {
- dev_err(dev, "Missing mediadek,larb phandle in %pOF node\n", node);
- return -EINVAL;
- }
-
- larb_pdev = of_find_device_by_node(larb_node);
- if (!larb_pdev) {
- dev_warn(dev, "Waiting for larb device %pOF\n", larb_node);
- of_node_put(larb_node);
- return -EPROBE_DEFER;
- }
- of_node_put(larb_node);
- comp->larb_dev = &larb_pdev->dev;
-
- return 0;
-}
-
int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp,
enum mtk_ddp_comp_id comp_id)
{
struct platform_device *comp_pdev;
enum mtk_ddp_comp_type type;
struct mtk_ddp_comp_dev *priv;
- int ret;
if (comp_id < 0 || comp_id >= DDP_COMPONENT_ID_MAX)
return -EINVAL;
@@ -495,16 +470,6 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp,
}
comp->dev = &comp_pdev->dev;
- /* Only DMA capable components need the LARB property */
- if (type == MTK_DISP_OVL ||
- type == MTK_DISP_OVL_2L ||
- type == MTK_DISP_RDMA ||
- type == MTK_DISP_WDMA) {
- ret = mtk_ddp_get_larb_dev(node, comp, comp->dev);
- if (ret)
- return ret;
- }
-
if (type == MTK_DISP_BLS ||
type == MTK_DISP_CCORR ||
type == MTK_DISP_COLOR ||
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
index bb914d976cf5..1b582262b682 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
@@ -70,7 +70,6 @@ struct mtk_ddp_comp_funcs {
struct mtk_ddp_comp {
struct device *dev;
int irq;
- struct device *larb_dev;
enum mtk_ddp_comp_id id;
const struct mtk_ddp_comp_funcs *funcs;
};
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index b013d56d2777..622de47239eb 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -576,11 +576,8 @@ static int mtk_drm_probe(struct platform_device *pdev)
pm_runtime_disable(dev);
err_node:
of_node_put(private->mutex_node);
- for (i = 0; i < DDP_COMPONENT_ID_MAX; i++) {
+ for (i = 0; i < DDP_COMPONENT_ID_MAX; i++)
of_node_put(private->comp_node[i]);
- if (private->ddp_comp[i].larb_dev)
- put_device(private->ddp_comp[i].larb_dev);
- }
return ret;
}
--
2.18.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v5 11/16] drm/mediatek: Get rid of mtk_smi_larb_get/put
2021-04-10 9:11 ` [PATCH v5 11/16] drm/mediatek: Get rid of mtk_smi_larb_get/put Yong Wu
@ 2021-05-26 5:41 ` Dafna Hirschfeld
2021-06-10 12:00 ` Yong Wu
0 siblings, 1 reply; 34+ messages in thread
From: Dafna Hirschfeld @ 2021-05-26 5:41 UTC (permalink / raw)
To: Yong Wu, Matthias Brugger, Joerg Roedel, Rob Herring,
Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot, CK Hu, Philipp Zabel
Hi
On 10.04.21 12:11, Yong Wu wrote:
> MediaTek IOMMU has already added the device_link between the consumer
> and smi-larb device. If the drm device call the pm_runtime_get_sync,
> the smi-larb's pm_runtime_get_sync also be called automatically.
>
> CC: CK Hu <ck.hu@mediatek.com>
> CC: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Yong Wu <yong.wu@mediatek.com>
> Reviewed-by: Evan Green <evgreen@chromium.org>
> Acked-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
> ---
> drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 9 ------
> drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 35 ---------------------
> drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 -
> drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +--
> 4 files changed, 1 insertion(+), 49 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index 971ef58ac1dc..d59353af4019 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -10,7 +10,6 @@
> #include <linux/soc/mediatek/mtk-mutex.h>
>
> #include <asm/barrier.h>
> -#include <soc/mediatek/smi.h>
>
> #include <drm/drm_atomic.h>
> #include <drm/drm_atomic_helper.h>
> @@ -544,12 +543,6 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
>
> DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id);
>
> - ret = mtk_smi_larb_get(comp->larb_dev);
> - if (ret) {
> - DRM_ERROR("Failed to get larb: %d\n", ret);
> - return;
> - }
> -
> ret = pm_runtime_resume_and_get(comp->dev);
> if (ret < 0)
> DRM_DEV_ERROR(comp->dev, "Failed to enable power domain: %d\n",
> @@ -557,7 +550,6 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
>
> ret = mtk_crtc_ddp_hw_init(mtk_crtc);
> if (ret) {
> - mtk_smi_larb_put(comp->larb_dev);
> pm_runtime_put(comp->dev);
> return;
> }
> @@ -594,7 +586,6 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
>
> drm_crtc_vblank_off(crtc);
> mtk_crtc_ddp_hw_fini(mtk_crtc);
> - mtk_smi_larb_put(comp->larb_dev);
> ret = pm_runtime_put(comp->dev);
> if (ret < 0)
> DRM_DEV_ERROR(comp->dev, "Failed to disable power domain: %d\n",
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> index 75bc00e17fc4..6c01492ba4df 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> @@ -449,37 +449,12 @@ unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,
> return ret;
> }
>
> -static int mtk_ddp_get_larb_dev(struct device_node *node, struct mtk_ddp_comp *comp,
> - struct device *dev)
> -{
> - struct device_node *larb_node;
> - struct platform_device *larb_pdev;
> -
> - larb_node = of_parse_phandle(node, "mediatek,larb", 0);
> - if (!larb_node) {
> - dev_err(dev, "Missing mediadek,larb phandle in %pOF node\n", node);
> - return -EINVAL;
> - }
> -
> - larb_pdev = of_find_device_by_node(larb_node);
> - if (!larb_pdev) {
> - dev_warn(dev, "Waiting for larb device %pOF\n", larb_node);
> - of_node_put(larb_node);
> - return -EPROBE_DEFER;
> - }
> - of_node_put(larb_node);
> - comp->larb_dev = &larb_pdev->dev;
> -
> - return 0;
> -}
> -
> int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp,
> enum mtk_ddp_comp_id comp_id)
> {
> struct platform_device *comp_pdev;
> enum mtk_ddp_comp_type type;
> struct mtk_ddp_comp_dev *priv;
> - int ret;
Hi,
This 'ret' is also used inside `if IS_REACHABLE(CONFIG_MTK_CMDQ)`
so it should not be removed.
Thanks,
Dafna
>
> if (comp_id < 0 || comp_id >= DDP_COMPONENT_ID_MAX)
> return -EINVAL;
> @@ -495,16 +470,6 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp,
> }
> comp->dev = &comp_pdev->dev;
>
> - /* Only DMA capable components need the LARB property */
> - if (type == MTK_DISP_OVL ||
> - type == MTK_DISP_OVL_2L ||
> - type == MTK_DISP_RDMA ||
> - type == MTK_DISP_WDMA) {
> - ret = mtk_ddp_get_larb_dev(node, comp, comp->dev);
> - if (ret)
> - return ret;
> - }
> -
> if (type == MTK_DISP_BLS ||
> type == MTK_DISP_CCORR ||
> type == MTK_DISP_COLOR ||
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> index bb914d976cf5..1b582262b682 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> @@ -70,7 +70,6 @@ struct mtk_ddp_comp_funcs {
> struct mtk_ddp_comp {
> struct device *dev;
> int irq;
> - struct device *larb_dev;
> enum mtk_ddp_comp_id id;
> const struct mtk_ddp_comp_funcs *funcs;
> };
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index b013d56d2777..622de47239eb 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -576,11 +576,8 @@ static int mtk_drm_probe(struct platform_device *pdev)
> pm_runtime_disable(dev);
> err_node:
> of_node_put(private->mutex_node);
> - for (i = 0; i < DDP_COMPONENT_ID_MAX; i++) {
> + for (i = 0; i < DDP_COMPONENT_ID_MAX; i++)
> of_node_put(private->comp_node[i]);
> - if (private->ddp_comp[i].larb_dev)
> - put_device(private->ddp_comp[i].larb_dev);
> - }
> return ret;
> }
>
>
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PATCH v5 11/16] drm/mediatek: Get rid of mtk_smi_larb_get/put
2021-05-26 5:41 ` Dafna Hirschfeld
@ 2021-06-10 12:00 ` Yong Wu
0 siblings, 0 replies; 34+ messages in thread
From: Yong Wu @ 2021-06-10 12:00 UTC (permalink / raw)
To: Dafna Hirschfeld
Cc: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski,
Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot, CK Hu, Philipp Zabel
On Wed, 2021-05-26 at 08:41 +0300, Dafna Hirschfeld wrote:
> Hi
>
> On 10.04.21 12:11, Yong Wu wrote:
> > MediaTek IOMMU has already added the device_link between the consumer
> > and smi-larb device. If the drm device call the pm_runtime_get_sync,
> > the smi-larb's pm_runtime_get_sync also be called automatically.
> >
> > CC: CK Hu <ck.hu@mediatek.com>
> > CC: Philipp Zabel <p.zabel@pengutronix.de>
> > Signed-off-by: Yong Wu <yong.wu@mediatek.com>
> > Reviewed-by: Evan Green <evgreen@chromium.org>
> > Acked-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
> > ---
> > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 9 ------
> > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 35 ---------------------
> > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 -
> > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +--
> > 4 files changed, 1 insertion(+), 49 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > index 971ef58ac1dc..d59353af4019 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > @@ -10,7 +10,6 @@
> > #include <linux/soc/mediatek/mtk-mutex.h>
> >
> > #include <asm/barrier.h>
> > -#include <soc/mediatek/smi.h>
> >
> > #include <drm/drm_atomic.h>
> > #include <drm/drm_atomic_helper.h>
> > @@ -544,12 +543,6 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
> >
> > DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id);
> >
> > - ret = mtk_smi_larb_get(comp->larb_dev);
> > - if (ret) {
> > - DRM_ERROR("Failed to get larb: %d\n", ret);
> > - return;
> > - }
> > -
> > ret = pm_runtime_resume_and_get(comp->dev);
> > if (ret < 0)
> > DRM_DEV_ERROR(comp->dev, "Failed to enable power domain: %d\n",
> > @@ -557,7 +550,6 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
> >
> > ret = mtk_crtc_ddp_hw_init(mtk_crtc);
> > if (ret) {
> > - mtk_smi_larb_put(comp->larb_dev);
> > pm_runtime_put(comp->dev);
> > return;
> > }
> > @@ -594,7 +586,6 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
> >
> > drm_crtc_vblank_off(crtc);
> > mtk_crtc_ddp_hw_fini(mtk_crtc);
> > - mtk_smi_larb_put(comp->larb_dev);
> > ret = pm_runtime_put(comp->dev);
> > if (ret < 0)
> > DRM_DEV_ERROR(comp->dev, "Failed to disable power domain: %d\n",
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> > index 75bc00e17fc4..6c01492ba4df 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> > @@ -449,37 +449,12 @@ unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,
> > return ret;
> > }
> >
> > -static int mtk_ddp_get_larb_dev(struct device_node *node, struct mtk_ddp_comp *comp,
> > - struct device *dev)
> > -{
> > - struct device_node *larb_node;
> > - struct platform_device *larb_pdev;
> > -
> > - larb_node = of_parse_phandle(node, "mediatek,larb", 0);
> > - if (!larb_node) {
> > - dev_err(dev, "Missing mediadek,larb phandle in %pOF node\n", node);
> > - return -EINVAL;
> > - }
> > -
> > - larb_pdev = of_find_device_by_node(larb_node);
> > - if (!larb_pdev) {
> > - dev_warn(dev, "Waiting for larb device %pOF\n", larb_node);
> > - of_node_put(larb_node);
> > - return -EPROBE_DEFER;
> > - }
> > - of_node_put(larb_node);
> > - comp->larb_dev = &larb_pdev->dev;
> > -
> > - return 0;
> > -}
> > -
> > int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp,
> > enum mtk_ddp_comp_id comp_id)
> > {
> > struct platform_device *comp_pdev;
> > enum mtk_ddp_comp_type type;
> > struct mtk_ddp_comp_dev *priv;
> > - int ret;
> Hi,
>
> This 'ret' is also used inside `if IS_REACHABLE(CONFIG_MTK_CMDQ)`
> so it should not be removed.
Hi Dafna,
Thanks very much for pointing out. Apparently I didn't enable this to
build. Sorry for this.
I will fix it in next version.
>
> Thanks,
> Dafna
>
> >
> > if (comp_id < 0 || comp_id >= DDP_COMPONENT_ID_MAX)
> > return -EINVAL;
> > @@ -495,16 +470,6 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp,
> > }
> > comp->dev = &comp_pdev->dev;
> >
> > - /* Only DMA capable components need the LARB property */
> > - if (type == MTK_DISP_OVL ||
> > - type == MTK_DISP_OVL_2L ||
> > - type == MTK_DISP_RDMA ||
> > - type == MTK_DISP_WDMA) {
> > - ret = mtk_ddp_get_larb_dev(node, comp, comp->dev);
> > - if (ret)
> > - return ret;
> > - }
> > -
> > if (type == MTK_DISP_BLS ||
> > type == MTK_DISP_CCORR ||
> > type == MTK_DISP_COLOR ||
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > index bb914d976cf5..1b582262b682 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > @@ -70,7 +70,6 @@ struct mtk_ddp_comp_funcs {
> > struct mtk_ddp_comp {
> > struct device *dev;
> > int irq;
> > - struct device *larb_dev;
> > enum mtk_ddp_comp_id id;
> > const struct mtk_ddp_comp_funcs *funcs;
> > };
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > index b013d56d2777..622de47239eb 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > @@ -576,11 +576,8 @@ static int mtk_drm_probe(struct platform_device *pdev)
> > pm_runtime_disable(dev);
> > err_node:
> > of_node_put(private->mutex_node);
> > - for (i = 0; i < DDP_COMPONENT_ID_MAX; i++) {
> > + for (i = 0; i < DDP_COMPONENT_ID_MAX; i++)
> > of_node_put(private->comp_node[i]);
> > - if (private->ddp_comp[i].larb_dev)
> > - put_device(private->ddp_comp[i].larb_dev);
> > - }
> > return ret;
> > }
> >
> >
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v5 12/16] media: mtk-vcodec: Use pm_runtime_resume_and_get for PM get_sync
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
` (10 preceding siblings ...)
2021-04-10 9:11 ` [PATCH v5 11/16] drm/mediatek: Get rid of mtk_smi_larb_get/put Yong Wu
@ 2021-04-10 9:11 ` Yong Wu
2021-04-10 9:11 ` [PATCH v5 13/16] media: mtk-vcodec: Get rid of mtk_smi_larb_get/put Yong Wu
` (4 subsequent siblings)
16 siblings, 0 replies; 34+ messages in thread
From: Yong Wu @ 2021-04-10 9:11 UTC (permalink / raw)
To: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, yong.wu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot
pm_runtime_get_sync will increment pm usage counter even it failed.
This patch use pm_runtime_resume_and_get instead of
pm_runtime_get_sync to keep usage counter balanced.
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
index ddee7046ce42..32e1858e9f1d 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
@@ -92,9 +92,10 @@ void mtk_vcodec_dec_pw_on(struct mtk_vcodec_pm *pm)
{
int ret;
- ret = pm_runtime_get_sync(pm->dev);
+ ret = pm_runtime_resume_and_get(pm->dev);
if (ret)
- mtk_v4l2_err("pm_runtime_get_sync fail %d", ret);
+ mtk_v4l2_err("pm_runtime_resume_and_get fail %d", ret);
+
}
void mtk_vcodec_dec_pw_off(struct mtk_vcodec_pm *pm)
--
2.18.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v5 13/16] media: mtk-vcodec: Get rid of mtk_smi_larb_get/put
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
` (11 preceding siblings ...)
2021-04-10 9:11 ` [PATCH v5 12/16] media: mtk-vcodec: Use pm_runtime_resume_and_get for PM get_sync Yong Wu
@ 2021-04-10 9:11 ` Yong Wu
2021-05-12 9:20 ` Hsin-Yi Wang
2021-04-10 9:11 ` [PATCH v5 14/16] memory: mtk-smi: " Yong Wu
` (3 subsequent siblings)
16 siblings, 1 reply; 34+ messages in thread
From: Yong Wu @ 2021-04-10 9:11 UTC (permalink / raw)
To: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, yong.wu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot, Tiffany Lin, Irui Wang
MediaTek IOMMU has already added the device_link between the consumer
and smi-larb device. If the vcodec device call the pm_runtime_get_sync,
the smi-larb's pm_runtime_get_sync also be called automatically.
CC: Tiffany Lin <tiffany.lin@mediatek.com>
CC: Irui Wang <irui.wang@mediatek.com>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Evan Green <evgreen@chromium.org>
Acked-by: Tiffany Lin <tiffany.lin@mediatek.com>
---
.../platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 37 ++-------------
.../platform/mtk-vcodec/mtk_vcodec_drv.h | 3 --
.../platform/mtk-vcodec/mtk_vcodec_enc.c | 1 -
.../platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 46 ++-----------------
4 files changed, 10 insertions(+), 77 deletions(-)
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
index 32e1858e9f1d..2b3562e47f4f 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
@@ -8,14 +8,12 @@
#include <linux/of_address.h>
#include <linux/of_platform.h>
#include <linux/pm_runtime.h>
-#include <soc/mediatek/smi.h>
#include "mtk_vcodec_dec_pm.h"
#include "mtk_vcodec_util.h"
int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
{
- struct device_node *node;
struct platform_device *pdev;
struct mtk_vcodec_pm *pm;
struct mtk_vcodec_clk *dec_clk;
@@ -26,18 +24,7 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
pm = &mtkdev->pm;
pm->mtkdev = mtkdev;
dec_clk = &pm->vdec_clk;
- node = of_parse_phandle(pdev->dev.of_node, "mediatek,larb", 0);
- if (!node) {
- mtk_v4l2_err("of_parse_phandle mediatek,larb fail!");
- return -1;
- }
- pdev = of_find_device_by_node(node);
- of_node_put(node);
- if (WARN_ON(!pdev)) {
- return -1;
- }
- pm->larbvdec = &pdev->dev;
pdev = mtkdev->plat_dev;
pm->dev = &pdev->dev;
@@ -47,14 +34,11 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
dec_clk->clk_info = devm_kcalloc(&pdev->dev,
dec_clk->clk_num, sizeof(*clk_info),
GFP_KERNEL);
- if (!dec_clk->clk_info) {
- ret = -ENOMEM;
- goto put_device;
- }
+ if (!dec_clk->clk_info)
+ return -ENOMEM;
} else {
mtk_v4l2_err("Failed to get vdec clock count");
- ret = -EINVAL;
- goto put_device;
+ return -EINVAL;
}
for (i = 0; i < dec_clk->clk_num; i++) {
@@ -63,29 +47,24 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
"clock-names", i, &clk_info->clk_name);
if (ret) {
mtk_v4l2_err("Failed to get clock name id = %d", i);
- goto put_device;
+ return ret;
}
clk_info->vcodec_clk = devm_clk_get(&pdev->dev,
clk_info->clk_name);
if (IS_ERR(clk_info->vcodec_clk)) {
mtk_v4l2_err("devm_clk_get (%d)%s fail", i,
clk_info->clk_name);
- ret = PTR_ERR(clk_info->vcodec_clk);
- goto put_device;
+ return PTR_ERR(clk_info->vcodec_clk);
}
}
pm_runtime_enable(&pdev->dev);
return 0;
-put_device:
- put_device(pm->larbvdec);
- return ret;
}
void mtk_vcodec_release_dec_pm(struct mtk_vcodec_dev *dev)
{
pm_runtime_disable(dev->pm.dev);
- put_device(dev->pm.larbvdec);
}
void mtk_vcodec_dec_pw_on(struct mtk_vcodec_pm *pm)
@@ -121,11 +100,6 @@ void mtk_vcodec_dec_clock_on(struct mtk_vcodec_pm *pm)
}
}
- ret = mtk_smi_larb_get(pm->larbvdec);
- if (ret) {
- mtk_v4l2_err("mtk_smi_larb_get larbvdec fail %d", ret);
- goto error;
- }
return;
error:
@@ -138,7 +112,6 @@ void mtk_vcodec_dec_clock_off(struct mtk_vcodec_pm *pm)
struct mtk_vcodec_clk *dec_clk = &pm->vdec_clk;
int i = 0;
- mtk_smi_larb_put(pm->larbvdec);
for (i = dec_clk->clk_num - 1; i >= 0; i--)
clk_disable_unprepare(dec_clk->clk_info[i].vcodec_clk);
}
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
index 869d958d2b99..659790398809 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
@@ -189,10 +189,7 @@ struct mtk_vcodec_clk {
*/
struct mtk_vcodec_pm {
struct mtk_vcodec_clk vdec_clk;
- struct device *larbvdec;
-
struct mtk_vcodec_clk venc_clk;
- struct device *larbvenc;
struct device *dev;
struct mtk_vcodec_dev *mtkdev;
};
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
index 4831052f475d..59816981735b 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
@@ -8,7 +8,6 @@
#include <media/v4l2-event.h>
#include <media/v4l2-mem2mem.h>
#include <media/videobuf2-dma-contig.h>
-#include <soc/mediatek/smi.h>
#include <linux/pm_runtime.h>
#include "mtk_vcodec_drv.h"
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
index 1b2e4930ed27..78b99ff882ae 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
@@ -8,58 +8,36 @@
#include <linux/of_address.h>
#include <linux/of_platform.h>
#include <linux/pm_runtime.h>
-#include <soc/mediatek/smi.h>
#include "mtk_vcodec_enc_pm.h"
#include "mtk_vcodec_util.h"
int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev)
{
- struct device_node *node;
struct platform_device *pdev;
struct mtk_vcodec_pm *pm;
struct mtk_vcodec_clk *enc_clk;
struct mtk_vcodec_clk_info *clk_info;
int ret = 0, i = 0;
- struct device *dev;
pdev = mtkdev->plat_dev;
pm = &mtkdev->pm;
memset(pm, 0, sizeof(struct mtk_vcodec_pm));
pm->mtkdev = mtkdev;
pm->dev = &pdev->dev;
- dev = &pdev->dev;
enc_clk = &pm->venc_clk;
- node = of_parse_phandle(dev->of_node, "mediatek,larb", 0);
- if (!node) {
- mtk_v4l2_err("no mediatek,larb found");
- return -ENODEV;
- }
- pdev = of_find_device_by_node(node);
- of_node_put(node);
- if (!pdev) {
- mtk_v4l2_err("no mediatek,larb device found");
- return -ENODEV;
- }
- pm->larbvenc = &pdev->dev;
- pdev = mtkdev->plat_dev;
- pm->dev = &pdev->dev;
-
enc_clk->clk_num = of_property_count_strings(pdev->dev.of_node,
"clock-names");
if (enc_clk->clk_num > 0) {
enc_clk->clk_info = devm_kcalloc(&pdev->dev,
enc_clk->clk_num, sizeof(*clk_info),
GFP_KERNEL);
- if (!enc_clk->clk_info) {
- ret = -ENOMEM;
- goto put_larbvenc;
- }
+ if (!enc_clk->clk_info)
+ return -ENOMEM;
} else {
mtk_v4l2_err("Failed to get venc clock count");
- ret = -EINVAL;
- goto put_larbvenc;
+ return -EINVAL;
}
for (i = 0; i < enc_clk->clk_num; i++) {
@@ -68,29 +46,23 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev)
"clock-names", i, &clk_info->clk_name);
if (ret) {
mtk_v4l2_err("venc failed to get clk name %d", i);
- goto put_larbvenc;
+ return ret;
}
clk_info->vcodec_clk = devm_clk_get(&pdev->dev,
clk_info->clk_name);
if (IS_ERR(clk_info->vcodec_clk)) {
mtk_v4l2_err("venc devm_clk_get (%d)%s fail", i,
clk_info->clk_name);
- ret = PTR_ERR(clk_info->vcodec_clk);
- goto put_larbvenc;
+ return PTR_ERR(clk_info->vcodec_clk);
}
}
return 0;
-
-put_larbvenc:
- put_device(pm->larbvenc);
- return ret;
}
void mtk_vcodec_release_enc_pm(struct mtk_vcodec_dev *mtkdev)
{
pm_runtime_disable(mtkdev->pm.dev);
- put_device(mtkdev->pm.larbvenc);
}
@@ -108,13 +80,6 @@ void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm)
}
}
- ret = mtk_smi_larb_get(pm->larbvenc);
- if (ret) {
- mtk_v4l2_err("mtk_smi_larb_get larb3 fail %d", ret);
- goto clkerr;
- }
- return;
-
clkerr:
for (i -= 1; i >= 0; i--)
clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
@@ -125,7 +90,6 @@ void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm)
struct mtk_vcodec_clk *enc_clk = &pm->venc_clk;
int i = 0;
- mtk_smi_larb_put(pm->larbvenc);
for (i = enc_clk->clk_num - 1; i >= 0; i--)
clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
}
--
2.18.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v5 13/16] media: mtk-vcodec: Get rid of mtk_smi_larb_get/put
2021-04-10 9:11 ` [PATCH v5 13/16] media: mtk-vcodec: Get rid of mtk_smi_larb_get/put Yong Wu
@ 2021-05-12 9:20 ` Hsin-Yi Wang
2021-05-12 12:29 ` Yong Wu
0 siblings, 1 reply; 34+ messages in thread
From: Hsin-Yi Wang @ 2021-05-12 9:20 UTC (permalink / raw)
To: Yong Wu
Cc: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski,
Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
moderated list:ARM/Mediatek SoC support, srv_heupstream,
Devicetree List, lkml,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE, iommu,
youlin.pei, Nicolas Boichat, Matthias Kaehlcke, anan.sun,
chao.hao, ming-fan.chen, yi.kuo, eizan, Alexandre Courbot,
Tiffany Lin, Irui Wang
On Sat, Apr 10, 2021 at 5:14 PM Yong Wu <yong.wu@mediatek.com> wrote:
>
> MediaTek IOMMU has already added the device_link between the consumer
> and smi-larb device. If the vcodec device call the pm_runtime_get_sync,
> the smi-larb's pm_runtime_get_sync also be called automatically.
>
> CC: Tiffany Lin <tiffany.lin@mediatek.com>
> CC: Irui Wang <irui.wang@mediatek.com>
> Signed-off-by: Yong Wu <yong.wu@mediatek.com>
> Reviewed-by: Evan Green <evgreen@chromium.org>
> Acked-by: Tiffany Lin <tiffany.lin@mediatek.com>
> ---
> .../platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 37 ++-------------
> .../platform/mtk-vcodec/mtk_vcodec_drv.h | 3 --
> .../platform/mtk-vcodec/mtk_vcodec_enc.c | 1 -
> .../platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 46 ++-----------------
> 4 files changed, 10 insertions(+), 77 deletions(-)
>
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
> index 32e1858e9f1d..2b3562e47f4f 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
> @@ -8,14 +8,12 @@
> #include <linux/of_address.h>
> #include <linux/of_platform.h>
> #include <linux/pm_runtime.h>
> -#include <soc/mediatek/smi.h>
>
> #include "mtk_vcodec_dec_pm.h"
> #include "mtk_vcodec_util.h"
>
> int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
> {
> - struct device_node *node;
> struct platform_device *pdev;
> struct mtk_vcodec_pm *pm;
> struct mtk_vcodec_clk *dec_clk;
> @@ -26,18 +24,7 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
> pm = &mtkdev->pm;
> pm->mtkdev = mtkdev;
> dec_clk = &pm->vdec_clk;
> - node = of_parse_phandle(pdev->dev.of_node, "mediatek,larb", 0);
> - if (!node) {
> - mtk_v4l2_err("of_parse_phandle mediatek,larb fail!");
> - return -1;
> - }
>
> - pdev = of_find_device_by_node(node);
> - of_node_put(node);
> - if (WARN_ON(!pdev)) {
> - return -1;
> - }
> - pm->larbvdec = &pdev->dev;
> pdev = mtkdev->plat_dev;
> pm->dev = &pdev->dev;
>
> @@ -47,14 +34,11 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
> dec_clk->clk_info = devm_kcalloc(&pdev->dev,
> dec_clk->clk_num, sizeof(*clk_info),
> GFP_KERNEL);
> - if (!dec_clk->clk_info) {
> - ret = -ENOMEM;
> - goto put_device;
> - }
> + if (!dec_clk->clk_info)
> + return -ENOMEM;
> } else {
> mtk_v4l2_err("Failed to get vdec clock count");
> - ret = -EINVAL;
> - goto put_device;
> + return -EINVAL;
> }
>
> for (i = 0; i < dec_clk->clk_num; i++) {
> @@ -63,29 +47,24 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
> "clock-names", i, &clk_info->clk_name);
> if (ret) {
> mtk_v4l2_err("Failed to get clock name id = %d", i);
> - goto put_device;
> + return ret;
> }
> clk_info->vcodec_clk = devm_clk_get(&pdev->dev,
> clk_info->clk_name);
> if (IS_ERR(clk_info->vcodec_clk)) {
> mtk_v4l2_err("devm_clk_get (%d)%s fail", i,
> clk_info->clk_name);
> - ret = PTR_ERR(clk_info->vcodec_clk);
> - goto put_device;
> + return PTR_ERR(clk_info->vcodec_clk);
> }
> }
>
> pm_runtime_enable(&pdev->dev);
> return 0;
> -put_device:
> - put_device(pm->larbvdec);
> - return ret;
> }
>
> void mtk_vcodec_release_dec_pm(struct mtk_vcodec_dev *dev)
> {
> pm_runtime_disable(dev->pm.dev);
> - put_device(dev->pm.larbvdec);
> }
>
> void mtk_vcodec_dec_pw_on(struct mtk_vcodec_pm *pm)
> @@ -121,11 +100,6 @@ void mtk_vcodec_dec_clock_on(struct mtk_vcodec_pm *pm)
> }
> }
>
> - ret = mtk_smi_larb_get(pm->larbvdec);
> - if (ret) {
> - mtk_v4l2_err("mtk_smi_larb_get larbvdec fail %d", ret);
> - goto error;
> - }
> return;
>
> error:
> @@ -138,7 +112,6 @@ void mtk_vcodec_dec_clock_off(struct mtk_vcodec_pm *pm)
> struct mtk_vcodec_clk *dec_clk = &pm->vdec_clk;
> int i = 0;
>
> - mtk_smi_larb_put(pm->larbvdec);
> for (i = dec_clk->clk_num - 1; i >= 0; i--)
> clk_disable_unprepare(dec_clk->clk_info[i].vcodec_clk);
> }
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> index 869d958d2b99..659790398809 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> @@ -189,10 +189,7 @@ struct mtk_vcodec_clk {
> */
> struct mtk_vcodec_pm {
> struct mtk_vcodec_clk vdec_clk;
> - struct device *larbvdec;
> -
> struct mtk_vcodec_clk venc_clk;
> - struct device *larbvenc;
> struct device *dev;
> struct mtk_vcodec_dev *mtkdev;
> };
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> index 4831052f475d..59816981735b 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> @@ -8,7 +8,6 @@
> #include <media/v4l2-event.h>
> #include <media/v4l2-mem2mem.h>
> #include <media/videobuf2-dma-contig.h>
> -#include <soc/mediatek/smi.h>
> #include <linux/pm_runtime.h>
>
> #include "mtk_vcodec_drv.h"
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> index 1b2e4930ed27..78b99ff882ae 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> @@ -8,58 +8,36 @@
> #include <linux/of_address.h>
> #include <linux/of_platform.h>
> #include <linux/pm_runtime.h>
> -#include <soc/mediatek/smi.h>
>
> #include "mtk_vcodec_enc_pm.h"
> #include "mtk_vcodec_util.h"
>
> int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev)
> {
> - struct device_node *node;
> struct platform_device *pdev;
> struct mtk_vcodec_pm *pm;
> struct mtk_vcodec_clk *enc_clk;
> struct mtk_vcodec_clk_info *clk_info;
> int ret = 0, i = 0;
> - struct device *dev;
>
> pdev = mtkdev->plat_dev;
> pm = &mtkdev->pm;
> memset(pm, 0, sizeof(struct mtk_vcodec_pm));
> pm->mtkdev = mtkdev;
> pm->dev = &pdev->dev;
> - dev = &pdev->dev;
> enc_clk = &pm->venc_clk;
>
> - node = of_parse_phandle(dev->of_node, "mediatek,larb", 0);
> - if (!node) {
> - mtk_v4l2_err("no mediatek,larb found");
> - return -ENODEV;
> - }
> - pdev = of_find_device_by_node(node);
> - of_node_put(node);
> - if (!pdev) {
> - mtk_v4l2_err("no mediatek,larb device found");
> - return -ENODEV;
> - }
> - pm->larbvenc = &pdev->dev;
> - pdev = mtkdev->plat_dev;
> - pm->dev = &pdev->dev;
> -
> enc_clk->clk_num = of_property_count_strings(pdev->dev.of_node,
> "clock-names");
> if (enc_clk->clk_num > 0) {
> enc_clk->clk_info = devm_kcalloc(&pdev->dev,
> enc_clk->clk_num, sizeof(*clk_info),
> GFP_KERNEL);
> - if (!enc_clk->clk_info) {
> - ret = -ENOMEM;
> - goto put_larbvenc;
> - }
> + if (!enc_clk->clk_info)
> + return -ENOMEM;
> } else {
> mtk_v4l2_err("Failed to get venc clock count");
> - ret = -EINVAL;
> - goto put_larbvenc;
> + return -EINVAL;
> }
>
> for (i = 0; i < enc_clk->clk_num; i++) {
> @@ -68,29 +46,23 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev)
> "clock-names", i, &clk_info->clk_name);
> if (ret) {
> mtk_v4l2_err("venc failed to get clk name %d", i);
> - goto put_larbvenc;
> + return ret;
> }
> clk_info->vcodec_clk = devm_clk_get(&pdev->dev,
> clk_info->clk_name);
> if (IS_ERR(clk_info->vcodec_clk)) {
> mtk_v4l2_err("venc devm_clk_get (%d)%s fail", i,
> clk_info->clk_name);
> - ret = PTR_ERR(clk_info->vcodec_clk);
> - goto put_larbvenc;
> + return PTR_ERR(clk_info->vcodec_clk);
> }
> }
>
> return 0;
> -
> -put_larbvenc:
> - put_device(pm->larbvenc);
> - return ret;
> }
>
> void mtk_vcodec_release_enc_pm(struct mtk_vcodec_dev *mtkdev)
> {
> pm_runtime_disable(mtkdev->pm.dev);
> - put_device(mtkdev->pm.larbvenc);
> }
>
>
> @@ -108,13 +80,6 @@ void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm)
> }
> }
>
> - ret = mtk_smi_larb_get(pm->larbvenc);
> - if (ret) {
> - mtk_v4l2_err("mtk_smi_larb_get larb3 fail %d", ret);
> - goto clkerr;
> - }
> - return;
You can't delete the return; here, otherwise vcodec_clk will be turned
off immediately after they are turned on.
> -
> clkerr:
> for (i -= 1; i >= 0; i--)
> clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
> @@ -125,7 +90,6 @@ void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm)
> struct mtk_vcodec_clk *enc_clk = &pm->venc_clk;
> int i = 0;
>
> - mtk_smi_larb_put(pm->larbvenc);
> for (i = enc_clk->clk_num - 1; i >= 0; i--)
> clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
> }
> --
> 2.18.0
>
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PATCH v5 13/16] media: mtk-vcodec: Get rid of mtk_smi_larb_get/put
2021-05-12 9:20 ` Hsin-Yi Wang
@ 2021-05-12 12:29 ` Yong Wu
2021-06-10 7:53 ` Matthias Brugger
0 siblings, 1 reply; 34+ messages in thread
From: Yong Wu @ 2021-05-12 12:29 UTC (permalink / raw)
To: Hsin-Yi Wang
Cc: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski,
Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
moderated list:ARM/Mediatek SoC support, srv_heupstream,
Devicetree List, lkml,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE, iommu,
youlin.pei, Nicolas Boichat, Matthias Kaehlcke, anan.sun,
chao.hao, ming-fan.chen, yi.kuo, eizan, Alexandre Courbot,
Tiffany Lin, Irui Wang
On Wed, 2021-05-12 at 17:20 +0800, Hsin-Yi Wang wrote:
> On Sat, Apr 10, 2021 at 5:14 PM Yong Wu <yong.wu@mediatek.com> wrote:
> >
> > MediaTek IOMMU has already added the device_link between the consumer
> > and smi-larb device. If the vcodec device call the pm_runtime_get_sync,
> > the smi-larb's pm_runtime_get_sync also be called automatically.
> >
> > CC: Tiffany Lin <tiffany.lin@mediatek.com>
> > CC: Irui Wang <irui.wang@mediatek.com>
> > Signed-off-by: Yong Wu <yong.wu@mediatek.com>
> > Reviewed-by: Evan Green <evgreen@chromium.org>
> > Acked-by: Tiffany Lin <tiffany.lin@mediatek.com>
> > ---
> > .../platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 37 ++-------------
> > .../platform/mtk-vcodec/mtk_vcodec_drv.h | 3 --
> > .../platform/mtk-vcodec/mtk_vcodec_enc.c | 1 -
> > .../platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 46 ++-----------------
> > 4 files changed, 10 insertions(+), 77 deletions(-)
[...]
> > @@ -108,13 +80,6 @@ void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm)
> > }
> > }
> >
> > - ret = mtk_smi_larb_get(pm->larbvenc);
> > - if (ret) {
> > - mtk_v4l2_err("mtk_smi_larb_get larb3 fail %d", ret);
> > - goto clkerr;
> > - }
> > - return;
>
> You can't delete the return; here, otherwise vcodec_clk will be turned
> off immediately after they are turned on.
Thanks very much for your review.
Sorry for this. You are quite right.
I checked this, it was introduced in v4 when I rebase the code. I will
fix it in next time.
>
> > -
> > clkerr:
> > for (i -= 1; i >= 0; i--)
> > clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
> > @@ -125,7 +90,6 @@ void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm)
> > struct mtk_vcodec_clk *enc_clk = &pm->venc_clk;
> > int i = 0;
> >
> > - mtk_smi_larb_put(pm->larbvenc);
> > for (i = enc_clk->clk_num - 1; i >= 0; i--)
> > clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
> > }
> > --
> > 2.18.0
> >
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PATCH v5 13/16] media: mtk-vcodec: Get rid of mtk_smi_larb_get/put
2021-05-12 12:29 ` Yong Wu
@ 2021-06-10 7:53 ` Matthias Brugger
2021-06-10 12:02 ` Yong Wu
0 siblings, 1 reply; 34+ messages in thread
From: Matthias Brugger @ 2021-06-10 7:53 UTC (permalink / raw)
To: Yong Wu, Hsin-Yi Wang
Cc: Joerg Roedel, Rob Herring, Krzysztof Kozlowski, Evan Green,
Robin Murphy, Tomasz Figa, Will Deacon,
moderated list:ARM/Mediatek SoC support, srv_heupstream,
Devicetree List, lkml,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE, iommu,
youlin.pei, Nicolas Boichat, Matthias Kaehlcke, anan.sun,
chao.hao, ming-fan.chen, yi.kuo, eizan, Alexandre Courbot,
Tiffany Lin, Irui Wang
Hi Yong,
On 12/05/2021 14:29, Yong Wu wrote:
> On Wed, 2021-05-12 at 17:20 +0800, Hsin-Yi Wang wrote:
>> On Sat, Apr 10, 2021 at 5:14 PM Yong Wu <yong.wu@mediatek.com> wrote:
>>>
>>> MediaTek IOMMU has already added the device_link between the consumer
>>> and smi-larb device. If the vcodec device call the pm_runtime_get_sync,
>>> the smi-larb's pm_runtime_get_sync also be called automatically.
>>>
>>> CC: Tiffany Lin <tiffany.lin@mediatek.com>
>>> CC: Irui Wang <irui.wang@mediatek.com>
>>> Signed-off-by: Yong Wu <yong.wu@mediatek.com>
>>> Reviewed-by: Evan Green <evgreen@chromium.org>
>>> Acked-by: Tiffany Lin <tiffany.lin@mediatek.com>
>>> ---
>>> .../platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 37 ++-------------
>>> .../platform/mtk-vcodec/mtk_vcodec_drv.h | 3 --
>>> .../platform/mtk-vcodec/mtk_vcodec_enc.c | 1 -
>>> .../platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 46 ++-----------------
>>> 4 files changed, 10 insertions(+), 77 deletions(-)
>
> [...]
>
>>> @@ -108,13 +80,6 @@ void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm)
>>> }
>>> }
>>>
>>> - ret = mtk_smi_larb_get(pm->larbvenc);
>>> - if (ret) {
>>> - mtk_v4l2_err("mtk_smi_larb_get larb3 fail %d", ret);
>>> - goto clkerr;
>>> - }
>>> - return;
>>
>> You can't delete the return; here, otherwise vcodec_clk will be turned
>> off immediately after they are turned on.
>
> Thanks very much for your review.
>
> Sorry for this. You are quite right.
>
> I checked this, it was introduced in v4 when I rebase the code. I will
> fix it in next time.
>
Please also make sure that you add all maintainers. I realized that at least for
the media/platform drivers we miss the maintainer and the corresponding mailing
list.
This is especially important in this series, as it spans several subsystems.
Thanks a lot,
Matthias
>>
>>> -
>>> clkerr:
>>> for (i -= 1; i >= 0; i--)
>>> clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
>>> @@ -125,7 +90,6 @@ void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm)
>>> struct mtk_vcodec_clk *enc_clk = &pm->venc_clk;
>>> int i = 0;
>>>
>>> - mtk_smi_larb_put(pm->larbvenc);
>>> for (i = enc_clk->clk_num - 1; i >= 0; i--)
>>> clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
>>> }
>>> --
>>> 2.18.0
>>>
>
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PATCH v5 13/16] media: mtk-vcodec: Get rid of mtk_smi_larb_get/put
2021-06-10 7:53 ` Matthias Brugger
@ 2021-06-10 12:02 ` Yong Wu
2021-06-11 10:07 ` Matthias Brugger
0 siblings, 1 reply; 34+ messages in thread
From: Yong Wu @ 2021-06-10 12:02 UTC (permalink / raw)
To: Matthias Brugger
Cc: Hsin-Yi Wang, Joerg Roedel, Rob Herring, Krzysztof Kozlowski,
Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
moderated list:ARM/Mediatek SoC support, srv_heupstream,
Devicetree List, lkml,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE, iommu,
youlin.pei, Nicolas Boichat, Matthias Kaehlcke, anan.sun,
chao.hao, ming-fan.chen, yi.kuo, eizan, Alexandre Courbot,
Tiffany Lin, Irui Wang, linux-media
On Thu, 2021-06-10 at 09:53 +0200, Matthias Brugger wrote:
> Hi Yong,
>
> On 12/05/2021 14:29, Yong Wu wrote:
> > On Wed, 2021-05-12 at 17:20 +0800, Hsin-Yi Wang wrote:
> >> On Sat, Apr 10, 2021 at 5:14 PM Yong Wu <yong.wu@mediatek.com> wrote:
> >>>
> >>> MediaTek IOMMU has already added the device_link between the consumer
> >>> and smi-larb device. If the vcodec device call the pm_runtime_get_sync,
> >>> the smi-larb's pm_runtime_get_sync also be called automatically.
> >>>
> >>> CC: Tiffany Lin <tiffany.lin@mediatek.com>
> >>> CC: Irui Wang <irui.wang@mediatek.com>
> >>> Signed-off-by: Yong Wu <yong.wu@mediatek.com>
> >>> Reviewed-by: Evan Green <evgreen@chromium.org>
> >>> Acked-by: Tiffany Lin <tiffany.lin@mediatek.com>
> >>> ---
> >>> .../platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 37 ++-------------
> >>> .../platform/mtk-vcodec/mtk_vcodec_drv.h | 3 --
> >>> .../platform/mtk-vcodec/mtk_vcodec_enc.c | 1 -
> >>> .../platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 46 ++-----------------
> >>> 4 files changed, 10 insertions(+), 77 deletions(-)
> >
> > [...]
> >
> >>> @@ -108,13 +80,6 @@ void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm)
> >>> }
> >>> }
> >>>
> >>> - ret = mtk_smi_larb_get(pm->larbvenc);
> >>> - if (ret) {
> >>> - mtk_v4l2_err("mtk_smi_larb_get larb3 fail %d", ret);
> >>> - goto clkerr;
> >>> - }
> >>> - return;
> >>
> >> You can't delete the return; here, otherwise vcodec_clk will be turned
> >> off immediately after they are turned on.
> >
> > Thanks very much for your review.
> >
> > Sorry for this. You are quite right.
> >
> > I checked this, it was introduced in v4 when I rebase the code. I will
> > fix it in next time.
> >
>
> Please also make sure that you add all maintainers. I realized that at least for
> the media/platform drivers we miss the maintainer and the corresponding mailing
> list.
> This is especially important in this series, as it spans several subsystems.
Thanks for hint. I only added the file maintainer here. I will add
linux-media in next version.
By the way, this patchset cross several trees, then which tree should it
go through. Do you have some suggestion?
>
> Thanks a lot,
> Matthias
>
> >>
> >>> -
> >>> clkerr:
> >>> for (i -= 1; i >= 0; i--)
> >>> clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
> >>> @@ -125,7 +90,6 @@ void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm)
> >>> struct mtk_vcodec_clk *enc_clk = &pm->venc_clk;
> >>> int i = 0;
> >>>
> >>> - mtk_smi_larb_put(pm->larbvenc);
> >>> for (i = enc_clk->clk_num - 1; i >= 0; i--)
> >>> clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
> >>> }
> >>> --
> >>> 2.18.0
> >>>
> >
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PATCH v5 13/16] media: mtk-vcodec: Get rid of mtk_smi_larb_get/put
2021-06-10 12:02 ` Yong Wu
@ 2021-06-11 10:07 ` Matthias Brugger
2021-06-11 10:46 ` Joerg Roedel
0 siblings, 1 reply; 34+ messages in thread
From: Matthias Brugger @ 2021-06-11 10:07 UTC (permalink / raw)
To: Yong Wu
Cc: Hsin-Yi Wang, Joerg Roedel, Rob Herring, Krzysztof Kozlowski,
Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
moderated list:ARM/Mediatek SoC support, srv_heupstream,
Devicetree List, lkml,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE, iommu,
youlin.pei, Nicolas Boichat, Matthias Kaehlcke, anan.sun,
chao.hao, ming-fan.chen, yi.kuo, eizan, Alexandre Courbot,
Tiffany Lin, Irui Wang, linux-media
On 10/06/2021 14:02, Yong Wu wrote:
> On Thu, 2021-06-10 at 09:53 +0200, Matthias Brugger wrote:
>> Hi Yong,
>>
>> On 12/05/2021 14:29, Yong Wu wrote:
>>> On Wed, 2021-05-12 at 17:20 +0800, Hsin-Yi Wang wrote:
>>>> On Sat, Apr 10, 2021 at 5:14 PM Yong Wu <yong.wu@mediatek.com> wrote:
>>>>>
>>>>> MediaTek IOMMU has already added the device_link between the consumer
>>>>> and smi-larb device. If the vcodec device call the pm_runtime_get_sync,
>>>>> the smi-larb's pm_runtime_get_sync also be called automatically.
>>>>>
>>>>> CC: Tiffany Lin <tiffany.lin@mediatek.com>
>>>>> CC: Irui Wang <irui.wang@mediatek.com>
>>>>> Signed-off-by: Yong Wu <yong.wu@mediatek.com>
>>>>> Reviewed-by: Evan Green <evgreen@chromium.org>
>>>>> Acked-by: Tiffany Lin <tiffany.lin@mediatek.com>
>>>>> ---
>>>>> .../platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 37 ++-------------
>>>>> .../platform/mtk-vcodec/mtk_vcodec_drv.h | 3 --
>>>>> .../platform/mtk-vcodec/mtk_vcodec_enc.c | 1 -
>>>>> .../platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 46 ++-----------------
>>>>> 4 files changed, 10 insertions(+), 77 deletions(-)
>>>
>>> [...]
>>>
>>>>> @@ -108,13 +80,6 @@ void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm)
>>>>> }
>>>>> }
>>>>>
>>>>> - ret = mtk_smi_larb_get(pm->larbvenc);
>>>>> - if (ret) {
>>>>> - mtk_v4l2_err("mtk_smi_larb_get larb3 fail %d", ret);
>>>>> - goto clkerr;
>>>>> - }
>>>>> - return;
>>>>
>>>> You can't delete the return; here, otherwise vcodec_clk will be turned
>>>> off immediately after they are turned on.
>>>
>>> Thanks very much for your review.
>>>
>>> Sorry for this. You are quite right.
>>>
>>> I checked this, it was introduced in v4 when I rebase the code. I will
>>> fix it in next time.
>>>
>>
>> Please also make sure that you add all maintainers. I realized that at least for
>> the media/platform drivers we miss the maintainer and the corresponding mailing
>> list.
>> This is especially important in this series, as it spans several subsystems.
>
> Thanks for hint. I only added the file maintainer here. I will add
> linux-media in next version.
>
> By the way, this patchset cross several trees, then which tree should it
> go through. Do you have some suggestion?
>
That's a good question. I think the media tree would be a good candidate, as it
has the biggest bunch of patches. But that would mean that Joerg is fine that.
The DTS part could still go through my tree.
Regards,
Matthias
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PATCH v5 13/16] media: mtk-vcodec: Get rid of mtk_smi_larb_get/put
2021-06-11 10:07 ` Matthias Brugger
@ 2021-06-11 10:46 ` Joerg Roedel
0 siblings, 0 replies; 34+ messages in thread
From: Joerg Roedel @ 2021-06-11 10:46 UTC (permalink / raw)
To: Matthias Brugger
Cc: Yong Wu, Hsin-Yi Wang, Rob Herring, Krzysztof Kozlowski,
Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
moderated list:ARM/Mediatek SoC support, srv_heupstream,
Devicetree List, lkml,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE, iommu,
youlin.pei, Nicolas Boichat, Matthias Kaehlcke, anan.sun,
chao.hao, ming-fan.chen, yi.kuo, eizan, Alexandre Courbot,
Tiffany Lin, Irui Wang, linux-media
On Fri, Jun 11, 2021 at 12:07:24PM +0200, Matthias Brugger wrote:
> That's a good question. I think the media tree would be a good
> candidate, as it has the biggest bunch of patches. But that would mean
> that Joerg is fine that. The DTS part could still go through my tree.
IOMMU changes are only a minor part of this, so it should not go through
the IOMMU tree. When Matthias has reviewed the IOMMU changes, feel free
to add my
Acked-by: Joerg Roedel <jroedel@suse.de>
to them.
Regards,
Joerg
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v5 14/16] memory: mtk-smi: Get rid of mtk_smi_larb_get/put
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
` (12 preceding siblings ...)
2021-04-10 9:11 ` [PATCH v5 13/16] media: mtk-vcodec: Get rid of mtk_smi_larb_get/put Yong Wu
@ 2021-04-10 9:11 ` Yong Wu
2021-04-13 14:04 ` Krzysztof Kozlowski
2021-06-09 14:42 ` Matthias Brugger
2021-04-10 9:11 ` [PATCH v5 15/16] arm: dts: mediatek: Get rid of mediatek,larb for MM nodes Yong Wu
` (2 subsequent siblings)
16 siblings, 2 replies; 34+ messages in thread
From: Yong Wu @ 2021-04-10 9:11 UTC (permalink / raw)
To: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, yong.wu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot
After adding device_link between the iommu consumer and smi-larb,
the pm_runtime_get(_sync) of smi-larb and smi-common will be called
automatically. we can get rid of mtk_smi_larb_get/put.
CC: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Evan Green <evgreen@chromium.org>
---
drivers/memory/mtk-smi.c | 14 --------------
include/soc/mediatek/smi.h | 20 --------------------
2 files changed, 34 deletions(-)
diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
index c5fb51f73b34..7c61c924e220 100644
--- a/drivers/memory/mtk-smi.c
+++ b/drivers/memory/mtk-smi.c
@@ -134,20 +134,6 @@ static void mtk_smi_clk_disable(const struct mtk_smi *smi)
clk_disable_unprepare(smi->clk_apb);
}
-int mtk_smi_larb_get(struct device *larbdev)
-{
- int ret = pm_runtime_resume_and_get(larbdev);
-
- return (ret < 0) ? ret : 0;
-}
-EXPORT_SYMBOL_GPL(mtk_smi_larb_get);
-
-void mtk_smi_larb_put(struct device *larbdev)
-{
- pm_runtime_put_sync(larbdev);
-}
-EXPORT_SYMBOL_GPL(mtk_smi_larb_put);
-
static int
mtk_smi_larb_bind(struct device *dev, struct device *master, void *data)
{
diff --git a/include/soc/mediatek/smi.h b/include/soc/mediatek/smi.h
index 15e3397cec58..11f7d6b59642 100644
--- a/include/soc/mediatek/smi.h
+++ b/include/soc/mediatek/smi.h
@@ -19,26 +19,6 @@ struct mtk_smi_larb_iommu {
unsigned char bank[32];
};
-/*
- * mtk_smi_larb_get: Enable the power domain and clocks for this local arbiter.
- * It also initialize some basic setting(like iommu).
- * mtk_smi_larb_put: Disable the power domain and clocks for this local arbiter.
- * Both should be called in non-atomic context.
- *
- * Returns 0 if successful, negative on failure.
- */
-int mtk_smi_larb_get(struct device *larbdev);
-void mtk_smi_larb_put(struct device *larbdev);
-
-#else
-
-static inline int mtk_smi_larb_get(struct device *larbdev)
-{
- return 0;
-}
-
-static inline void mtk_smi_larb_put(struct device *larbdev) { }
-
#endif
#endif
--
2.18.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v5 14/16] memory: mtk-smi: Get rid of mtk_smi_larb_get/put
2021-04-10 9:11 ` [PATCH v5 14/16] memory: mtk-smi: " Yong Wu
@ 2021-04-13 14:04 ` Krzysztof Kozlowski
2021-06-09 14:42 ` Matthias Brugger
1 sibling, 0 replies; 34+ messages in thread
From: Krzysztof Kozlowski @ 2021-04-13 14:04 UTC (permalink / raw)
To: Yong Wu, Matthias Brugger, Joerg Roedel, Rob Herring
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot
On 10/04/2021 11:11, Yong Wu wrote:
> After adding device_link between the iommu consumer and smi-larb,
> the pm_runtime_get(_sync) of smi-larb and smi-common will be called
> automatically. we can get rid of mtk_smi_larb_get/put.
>
> CC: Matthias Brugger <matthias.bgg@gmail.com>
> Signed-off-by: Yong Wu <yong.wu@mediatek.com>
> Reviewed-by: Evan Green <evgreen@chromium.org>
> ---
> drivers/memory/mtk-smi.c | 14 --------------
> include/soc/mediatek/smi.h | 20 --------------------
> 2 files changed, 34 deletions(-)
>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v5 14/16] memory: mtk-smi: Get rid of mtk_smi_larb_get/put
2021-04-10 9:11 ` [PATCH v5 14/16] memory: mtk-smi: " Yong Wu
2021-04-13 14:04 ` Krzysztof Kozlowski
@ 2021-06-09 14:42 ` Matthias Brugger
1 sibling, 0 replies; 34+ messages in thread
From: Matthias Brugger @ 2021-06-09 14:42 UTC (permalink / raw)
To: Yong Wu, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot
On 10/04/2021 11:11, Yong Wu wrote:
> After adding device_link between the iommu consumer and smi-larb,
> the pm_runtime_get(_sync) of smi-larb and smi-common will be called
> automatically. we can get rid of mtk_smi_larb_get/put.
>
> CC: Matthias Brugger <matthias.bgg@gmail.com>
> Signed-off-by: Yong Wu <yong.wu@mediatek.com>
> Reviewed-by: Evan Green <evgreen@chromium.org>
Acked-by: Matthias Brugger <matthias.bgg@gmail.com>
> ---
> drivers/memory/mtk-smi.c | 14 --------------
> include/soc/mediatek/smi.h | 20 --------------------
> 2 files changed, 34 deletions(-)
>
> diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
> index c5fb51f73b34..7c61c924e220 100644
> --- a/drivers/memory/mtk-smi.c
> +++ b/drivers/memory/mtk-smi.c
> @@ -134,20 +134,6 @@ static void mtk_smi_clk_disable(const struct mtk_smi *smi)
> clk_disable_unprepare(smi->clk_apb);
> }
>
> -int mtk_smi_larb_get(struct device *larbdev)
> -{
> - int ret = pm_runtime_resume_and_get(larbdev);
> -
> - return (ret < 0) ? ret : 0;
> -}
> -EXPORT_SYMBOL_GPL(mtk_smi_larb_get);
> -
> -void mtk_smi_larb_put(struct device *larbdev)
> -{
> - pm_runtime_put_sync(larbdev);
> -}
> -EXPORT_SYMBOL_GPL(mtk_smi_larb_put);
> -
> static int
> mtk_smi_larb_bind(struct device *dev, struct device *master, void *data)
> {
> diff --git a/include/soc/mediatek/smi.h b/include/soc/mediatek/smi.h
> index 15e3397cec58..11f7d6b59642 100644
> --- a/include/soc/mediatek/smi.h
> +++ b/include/soc/mediatek/smi.h
> @@ -19,26 +19,6 @@ struct mtk_smi_larb_iommu {
> unsigned char bank[32];
> };
>
> -/*
> - * mtk_smi_larb_get: Enable the power domain and clocks for this local arbiter.
> - * It also initialize some basic setting(like iommu).
> - * mtk_smi_larb_put: Disable the power domain and clocks for this local arbiter.
> - * Both should be called in non-atomic context.
> - *
> - * Returns 0 if successful, negative on failure.
> - */
> -int mtk_smi_larb_get(struct device *larbdev);
> -void mtk_smi_larb_put(struct device *larbdev);
> -
> -#else
> -
> -static inline int mtk_smi_larb_get(struct device *larbdev)
> -{
> - return 0;
> -}
> -
> -static inline void mtk_smi_larb_put(struct device *larbdev) { }
> -
> #endif
>
> #endif
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v5 15/16] arm: dts: mediatek: Get rid of mediatek,larb for MM nodes
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
` (13 preceding siblings ...)
2021-04-10 9:11 ` [PATCH v5 14/16] memory: mtk-smi: " Yong Wu
@ 2021-04-10 9:11 ` Yong Wu
2021-04-10 9:11 ` [PATCH v5 16/16] arm64: " Yong Wu
2021-04-13 14:58 ` (subset) [PATCH v5 00/16] Clean up "mediatek,larb" Krzysztof Kozlowski
16 siblings, 0 replies; 34+ messages in thread
From: Yong Wu @ 2021-04-10 9:11 UTC (permalink / raw)
To: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, yong.wu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot
After adding device_link between the IOMMU consumer and smi,
the mediatek,larb is unnecessary now.
CC: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Evan Green <evgreen@chromium.org>
---
arch/arm/boot/dts/mt2701.dtsi | 2 --
arch/arm/boot/dts/mt7623n.dtsi | 5 -----
2 files changed, 7 deletions(-)
diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi
index fade14284017..0a7892bcf536 100644
--- a/arch/arm/boot/dts/mt2701.dtsi
+++ b/arch/arm/boot/dts/mt2701.dtsi
@@ -564,7 +564,6 @@
clock-names = "jpgdec-smi",
"jpgdec";
power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>;
- mediatek,larb = <&larb2>;
iommus = <&iommu MT2701_M4U_PORT_JPGDEC_WDMA>,
<&iommu MT2701_M4U_PORT_JPGDEC_BSDMA>;
};
@@ -577,7 +576,6 @@
clocks = <&imgsys CLK_IMG_VENC>;
clock-names = "jpgenc";
power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>;
- mediatek,larb = <&larb2>;
iommus = <&iommu MT2701_M4U_PORT_JPGENC_RDMA>,
<&iommu MT2701_M4U_PORT_JPGENC_BSDMA>;
};
diff --git a/arch/arm/boot/dts/mt7623n.dtsi b/arch/arm/boot/dts/mt7623n.dtsi
index 1880ac9e32cf..2e6c16164744 100644
--- a/arch/arm/boot/dts/mt7623n.dtsi
+++ b/arch/arm/boot/dts/mt7623n.dtsi
@@ -121,7 +121,6 @@
clock-names = "jpgdec-smi",
"jpgdec";
power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>;
- mediatek,larb = <&larb2>;
iommus = <&iommu MT2701_M4U_PORT_JPGDEC_WDMA>,
<&iommu MT2701_M4U_PORT_JPGDEC_BSDMA>;
};
@@ -144,7 +143,6 @@
interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_LOW>;
clocks = <&mmsys CLK_MM_DISP_OVL>;
iommus = <&iommu MT2701_M4U_PORT_DISP_OVL_0>;
- mediatek,larb = <&larb0>;
};
rdma0: rdma@14008000 {
@@ -154,7 +152,6 @@
interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_LOW>;
clocks = <&mmsys CLK_MM_DISP_RDMA>;
iommus = <&iommu MT2701_M4U_PORT_DISP_RDMA>;
- mediatek,larb = <&larb0>;
};
wdma@14009000 {
@@ -164,7 +161,6 @@
interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_LOW>;
clocks = <&mmsys CLK_MM_DISP_WDMA>;
iommus = <&iommu MT2701_M4U_PORT_DISP_WDMA>;
- mediatek,larb = <&larb0>;
};
bls: pwm@1400a000 {
@@ -215,7 +211,6 @@
interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_LOW>;
clocks = <&mmsys CLK_MM_DISP_RDMA1>;
iommus = <&iommu MT2701_M4U_PORT_DISP_RDMA1>;
- mediatek,larb = <&larb0>;
};
dpi0: dpi@14014000 {
--
2.18.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v5 16/16] arm64: dts: mediatek: Get rid of mediatek,larb for MM nodes
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
` (14 preceding siblings ...)
2021-04-10 9:11 ` [PATCH v5 15/16] arm: dts: mediatek: Get rid of mediatek,larb for MM nodes Yong Wu
@ 2021-04-10 9:11 ` Yong Wu
2021-04-13 14:58 ` (subset) [PATCH v5 00/16] Clean up "mediatek,larb" Krzysztof Kozlowski
16 siblings, 0 replies; 34+ messages in thread
From: Yong Wu @ 2021-04-10 9:11 UTC (permalink / raw)
To: Matthias Brugger, Joerg Roedel, Rob Herring, Krzysztof Kozlowski
Cc: Evan Green, Robin Murphy, Tomasz Figa, Will Deacon,
linux-mediatek, srv_heupstream, devicetree, linux-kernel,
linux-arm-kernel, iommu, yong.wu, youlin.pei, Nicolas Boichat,
Matthias Kaehlcke, anan.sun, chao.hao, ming-fan.chen, yi.kuo,
eizan, acourbot
After adding device_link between the IOMMU consumer and smi,
the mediatek,larb is unnecessary now.
CC: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Evan Green <evgreen@chromium.org>
---
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 16 ----------------
arch/arm64/boot/dts/mediatek/mt8183.dtsi | 5 -----
2 files changed, 21 deletions(-)
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index f5950e9fc51d..683bce5eef37 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -1008,7 +1008,6 @@
<&mmsys CLK_MM_MUTEX_32K>;
power-domains = <&spm MT8173_POWER_DOMAIN_MM>;
iommus = <&iommu M4U_PORT_MDP_RDMA0>;
- mediatek,larb = <&larb0>;
mediatek,vpu = <&vpu>;
};
@@ -1019,7 +1018,6 @@
<&mmsys CLK_MM_MUTEX_32K>;
power-domains = <&spm MT8173_POWER_DOMAIN_MM>;
iommus = <&iommu M4U_PORT_MDP_RDMA1>;
- mediatek,larb = <&larb4>;
};
mdp_rsz0: rsz@14003000 {
@@ -1049,7 +1047,6 @@
clocks = <&mmsys CLK_MM_MDP_WDMA>;
power-domains = <&spm MT8173_POWER_DOMAIN_MM>;
iommus = <&iommu M4U_PORT_MDP_WDMA>;
- mediatek,larb = <&larb0>;
};
mdp_wrot0: wrot@14007000 {
@@ -1058,7 +1055,6 @@
clocks = <&mmsys CLK_MM_MDP_WROT0>;
power-domains = <&spm MT8173_POWER_DOMAIN_MM>;
iommus = <&iommu M4U_PORT_MDP_WROT0>;
- mediatek,larb = <&larb0>;
};
mdp_wrot1: wrot@14008000 {
@@ -1067,7 +1063,6 @@
clocks = <&mmsys CLK_MM_MDP_WROT1>;
power-domains = <&spm MT8173_POWER_DOMAIN_MM>;
iommus = <&iommu M4U_PORT_MDP_WROT1>;
- mediatek,larb = <&larb4>;
};
ovl0: ovl@1400c000 {
@@ -1077,7 +1072,6 @@
power-domains = <&spm MT8173_POWER_DOMAIN_MM>;
clocks = <&mmsys CLK_MM_DISP_OVL0>;
iommus = <&iommu M4U_PORT_DISP_OVL0>;
- mediatek,larb = <&larb0>;
mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0xc000 0x1000>;
};
@@ -1088,7 +1082,6 @@
power-domains = <&spm MT8173_POWER_DOMAIN_MM>;
clocks = <&mmsys CLK_MM_DISP_OVL1>;
iommus = <&iommu M4U_PORT_DISP_OVL1>;
- mediatek,larb = <&larb4>;
mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0xd000 0x1000>;
};
@@ -1099,7 +1092,6 @@
power-domains = <&spm MT8173_POWER_DOMAIN_MM>;
clocks = <&mmsys CLK_MM_DISP_RDMA0>;
iommus = <&iommu M4U_PORT_DISP_RDMA0>;
- mediatek,larb = <&larb0>;
mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0xe000 0x1000>;
};
@@ -1110,7 +1102,6 @@
power-domains = <&spm MT8173_POWER_DOMAIN_MM>;
clocks = <&mmsys CLK_MM_DISP_RDMA1>;
iommus = <&iommu M4U_PORT_DISP_RDMA1>;
- mediatek,larb = <&larb4>;
mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0xf000 0x1000>;
};
@@ -1121,7 +1112,6 @@
power-domains = <&spm MT8173_POWER_DOMAIN_MM>;
clocks = <&mmsys CLK_MM_DISP_RDMA2>;
iommus = <&iommu M4U_PORT_DISP_RDMA2>;
- mediatek,larb = <&larb4>;
mediatek,gce-client-reg = <&gce SUBSYS_1401XXXX 0 0x1000>;
};
@@ -1132,7 +1122,6 @@
power-domains = <&spm MT8173_POWER_DOMAIN_MM>;
clocks = <&mmsys CLK_MM_DISP_WDMA0>;
iommus = <&iommu M4U_PORT_DISP_WDMA0>;
- mediatek,larb = <&larb0>;
mediatek,gce-client-reg = <&gce SUBSYS_1401XXXX 0x1000 0x1000>;
};
@@ -1143,7 +1132,6 @@
power-domains = <&spm MT8173_POWER_DOMAIN_MM>;
clocks = <&mmsys CLK_MM_DISP_WDMA1>;
iommus = <&iommu M4U_PORT_DISP_WDMA1>;
- mediatek,larb = <&larb4>;
mediatek,gce-client-reg = <&gce SUBSYS_1401XXXX 0x2000 0x1000>;
};
@@ -1394,7 +1382,6 @@
<0 0x16027800 0 0x800>, /* VDEC_HWB */
<0 0x16028400 0 0x400>; /* VDEC_HWG */
interrupts = <GIC_SPI 204 IRQ_TYPE_LEVEL_LOW>;
- mediatek,larb = <&larb1>;
iommus = <&iommu M4U_PORT_HW_VDEC_MC_EXT>,
<&iommu M4U_PORT_HW_VDEC_PP_EXT>,
<&iommu M4U_PORT_HW_VDEC_AVC_MV_EXT>,
@@ -1462,7 +1449,6 @@
compatible = "mediatek,mt8173-vcodec-enc";
reg = <0 0x18002000 0 0x1000>; /* VENC_SYS */
interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_LOW>;
- mediatek,larb = <&larb3>;
iommus = <&iommu M4U_PORT_VENC_RCPU>,
<&iommu M4U_PORT_VENC_REC>,
<&iommu M4U_PORT_VENC_BSDMA>,
@@ -1490,7 +1476,6 @@
clock-names = "jpgdec-smi",
"jpgdec";
power-domains = <&spm MT8173_POWER_DOMAIN_VENC>;
- mediatek,larb = <&larb3>;
iommus = <&iommu M4U_PORT_JPGDEC_WDMA>,
<&iommu M4U_PORT_JPGDEC_BSDMA>;
};
@@ -1524,7 +1509,6 @@
<&iommu M4U_PORT_VENC_CUR_CHROMA_SET2>,
<&iommu M4U_PORT_VENC_REF_LUMA_SET2>,
<&iommu M4U_PORT_VENC_REC_CHROMA_SET2>;
- mediatek,larb = <&larb5>;
mediatek,vpu = <&vpu>;
clocks = <&topckgen CLK_TOP_VENC_LT_SEL>;
clock-names = "venc_lt_sel";
diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
index 80519a145f13..ee684bb65daf 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
@@ -992,7 +992,6 @@
power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;
clocks = <&mmsys CLK_MM_DISP_OVL0>;
iommus = <&iommu M4U_PORT_DISP_OVL0>;
- mediatek,larb = <&larb0>;
mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x8000 0x1000>;
};
@@ -1003,7 +1002,6 @@
power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;
clocks = <&mmsys CLK_MM_DISP_OVL0_2L>;
iommus = <&iommu M4U_PORT_DISP_2L_OVL0_LARB0>;
- mediatek,larb = <&larb0>;
mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x9000 0x1000>;
};
@@ -1014,7 +1012,6 @@
power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;
clocks = <&mmsys CLK_MM_DISP_OVL1_2L>;
iommus = <&iommu M4U_PORT_DISP_2L_OVL1_LARB0>;
- mediatek,larb = <&larb0>;
mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0xa000 0x1000>;
};
@@ -1025,7 +1022,6 @@
power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;
clocks = <&mmsys CLK_MM_DISP_RDMA0>;
iommus = <&iommu M4U_PORT_DISP_RDMA0>;
- mediatek,larb = <&larb0>;
mediatek,rdma-fifo-size = <5120>;
mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0xb000 0x1000>;
};
@@ -1037,7 +1033,6 @@
power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;
clocks = <&mmsys CLK_MM_DISP_RDMA1>;
iommus = <&iommu M4U_PORT_DISP_RDMA1>;
- mediatek,larb = <&larb0>;
mediatek,rdma-fifo-size = <2048>;
mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0xc000 0x1000>;
};
--
2.18.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: (subset) [PATCH v5 00/16] Clean up "mediatek,larb"
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
` (15 preceding siblings ...)
2021-04-10 9:11 ` [PATCH v5 16/16] arm64: " Yong Wu
@ 2021-04-13 14:58 ` Krzysztof Kozlowski
16 siblings, 0 replies; 34+ messages in thread
From: Krzysztof Kozlowski @ 2021-04-13 14:58 UTC (permalink / raw)
To: Yong Wu, Rob Herring, Krzysztof Kozlowski, Matthias Brugger,
Joerg Roedel
Cc: Krzysztof Kozlowski, Tomasz Figa, youlin.pei, acourbot, iommu,
eizan, linux-mediatek, yi.kuo, anan.sun, chao.hao, Evan Green,
Matthias Kaehlcke, Will Deacon, linux-arm-kernel, srv_heupstream,
ming-fan.chen, linux-kernel, Robin Murphy, Nicolas Boichat,
devicetree
On Sat, 10 Apr 2021 17:11:12 +0800, Yong Wu wrote:
> MediaTek IOMMU block diagram always like below:
>
> M4U
> |
> smi-common
> |
> -------------
> | | ...
> | |
> larb1 larb2
> | |
> vdec venc
>
> [...]
Applied, thanks!
[04/16] memory: mtk-smi: Add device-link between smi-larb and smi-common
commit: 6ce2c05b21189eb17b3aa26720cc5841acf9dce8
Best regards,
--
Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
^ permalink raw reply [flat|nested] 34+ messages in thread