* [PATCH v4 0/2] Add vcodec lat and core nodes for mt8192
@ 2022-09-30 11:22 Allen-KH Cheng
2022-09-30 11:22 ` [PATCH v4 1/2] media: dt-bindings: mediatek: Rename child node names for decoder Allen-KH Cheng
` (2 more replies)
0 siblings, 3 replies; 16+ messages in thread
From: Allen-KH Cheng @ 2022-09-30 11:22 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Matthias Brugger, Rob Herring,
Krzysztof Kozlowski
Cc: Project_Global_Chrome_Upstream_Group, linux-media, devicetree,
linux-arm-kernel, linux-kernel, linux-mediatek, Allen-KH Cheng
This series is based on linux-next, tag: next-20220929.
Change in v3:
- Drop `vcodec_lat:` and `vcodec_core:`
Change in v2:
- Add a dt-bindings patch for changing "vcodec" to "video-codec"
- Rename child names for vcodec lat and core nodes
Change in v1:
- Replace node names with video-codec
[Allen-KH Cheng <allen-kh.cheng@mediatek.com>]
Allen-KH Cheng (2):
media: dt-bindings: mediatek: Rename child node names for decoder
arm64: dts: mt8192: Add vcodec lat and core nodes
.../media/mediatek,vcodec-subdev-decoder.yaml | 8 +--
arch/arm64/boot/dts/mediatek/mt8192.dtsi | 60 +++++++++++++++++++
2 files changed, 64 insertions(+), 4 deletions(-)
--
2.18.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH v4 1/2] media: dt-bindings: mediatek: Rename child node names for decoder 2022-09-30 11:22 [PATCH v4 0/2] Add vcodec lat and core nodes for mt8192 Allen-KH Cheng @ 2022-09-30 11:22 ` Allen-KH Cheng 2022-09-30 22:00 ` Rob Herring 2022-10-03 13:26 ` Krzysztof Kozlowski 2022-09-30 11:22 ` [PATCH v4 2/2] arm64: dts: mt8192: Add vcodec lat and core nodes Allen-KH Cheng 2022-11-18 7:12 ` [PATCH v4 0/2] Add vcodec lat and core nodes for mt8192 Allen-KH Cheng (程冠勳) 2 siblings, 2 replies; 16+ messages in thread From: Allen-KH Cheng @ 2022-09-30 11:22 UTC (permalink / raw) To: Mauro Carvalho Chehab, Matthias Brugger, Rob Herring, Krzysztof Kozlowski Cc: Project_Global_Chrome_Upstream_Group, linux-media, devicetree, linux-arm-kernel, linux-kernel, linux-mediatek, Allen-KH Cheng In order to make the names of the child nodes more generic, we rename "vcodec" to "video-codec" for decoder in patternProperties and example. Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- .../bindings/media/mediatek,vcodec-subdev-decoder.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml b/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml index c4f20acdc1f8..67fde48f991c 100644 --- a/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml @@ -91,7 +91,7 @@ properties: # Required child node: patternProperties: - '^vcodec-lat@[0-9a-f]+$': + '^video-codec-lat@[0-9a-f]+$': type: object properties: @@ -145,7 +145,7 @@ patternProperties: additionalProperties: false - '^vcodec-core@[0-9a-f]+$': + '^video-codec-core@[0-9a-f]+$': type: object properties: @@ -241,7 +241,7 @@ examples: #size-cells = <2>; ranges = <0 0 0 0x16000000 0 0x40000>; reg = <0 0x16000000 0 0x1000>; /* VDEC_SYS */ - vcodec-lat@10000 { + video-codec-lat@10000 { compatible = "mediatek,mtk-vcodec-lat"; reg = <0 0x10000 0 0x800>; interrupts = <GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH 0>; @@ -264,7 +264,7 @@ examples: power-domains = <&spm MT8192_POWER_DOMAIN_VDEC>; }; - vcodec-core@25000 { + video-codec-core@25000 { compatible = "mediatek,mtk-vcodec-core"; reg = <0 0x25000 0 0x1000>; interrupts = <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH 0>; -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH v4 1/2] media: dt-bindings: mediatek: Rename child node names for decoder 2022-09-30 11:22 ` [PATCH v4 1/2] media: dt-bindings: mediatek: Rename child node names for decoder Allen-KH Cheng @ 2022-09-30 22:00 ` Rob Herring 2022-10-05 7:21 ` Allen-KH Cheng (程冠勳) 2022-10-03 13:26 ` Krzysztof Kozlowski 1 sibling, 1 reply; 16+ messages in thread From: Rob Herring @ 2022-09-30 22:00 UTC (permalink / raw) To: Allen-KH Cheng Cc: Mauro Carvalho Chehab, Matthias Brugger, Krzysztof Kozlowski, Project_Global_Chrome_Upstream_Group, linux-media, devicetree, linux-arm-kernel, linux-kernel, linux-mediatek On Fri, Sep 30, 2022 at 07:22:36PM +0800, Allen-KH Cheng wrote: > In order to make the names of the child nodes more generic, we rename > "vcodec" to "video-codec" for decoder in patternProperties and example. They are either generic or they aren't. Until something generic is defined, I don't think it's worth the churn to change. > Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > .../bindings/media/mediatek,vcodec-subdev-decoder.yaml | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml b/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml > index c4f20acdc1f8..67fde48f991c 100644 > --- a/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml > +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml > @@ -91,7 +91,7 @@ properties: > > # Required child node: > patternProperties: > - '^vcodec-lat@[0-9a-f]+$': > + '^video-codec-lat@[0-9a-f]+$': Just 'video-codec' doesn't work? > type: object > > properties: > @@ -145,7 +145,7 @@ patternProperties: > > additionalProperties: false > > - '^vcodec-core@[0-9a-f]+$': > + '^video-codec-core@[0-9a-f]+$': > type: object > > properties: > @@ -241,7 +241,7 @@ examples: > #size-cells = <2>; > ranges = <0 0 0 0x16000000 0 0x40000>; > reg = <0 0x16000000 0 0x1000>; /* VDEC_SYS */ > - vcodec-lat@10000 { > + video-codec-lat@10000 { > compatible = "mediatek,mtk-vcodec-lat"; > reg = <0 0x10000 0 0x800>; > interrupts = <GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH 0>; > @@ -264,7 +264,7 @@ examples: > power-domains = <&spm MT8192_POWER_DOMAIN_VDEC>; > }; > > - vcodec-core@25000 { > + video-codec-core@25000 { > compatible = "mediatek,mtk-vcodec-core"; > reg = <0 0x25000 0 0x1000>; > interrupts = <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH 0>; > -- > 2.18.0 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v4 1/2] media: dt-bindings: mediatek: Rename child node names for decoder 2022-09-30 22:00 ` Rob Herring @ 2022-10-05 7:21 ` Allen-KH Cheng (程冠勳) 2022-10-05 7:30 ` Krzysztof Kozlowski 0 siblings, 1 reply; 16+ messages in thread From: Allen-KH Cheng (程冠勳) @ 2022-10-05 7:21 UTC (permalink / raw) To: robh Cc: linux-kernel, linux-mediatek, linux-media, devicetree, mchehab, krzysztof.kozlowski, Project_Global_Chrome_Upstream_Group, linux-arm-kernel, matthias.bgg Hi Rob, On Fri, 2022-09-30 at 17:00 -0500, Rob Herring wrote: > On Fri, Sep 30, 2022 at 07:22:36PM +0800, Allen-KH Cheng wrote: > > In order to make the names of the child nodes more generic, we > > rename > > "vcodec" to "video-codec" for decoder in patternProperties and > > example. > > They are either generic or they aren't. Until something generic is > defined, I don't think it's worth the churn to change. > > > > Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> > > Reviewed-by: AngeloGioacchino Del Regno < > > angelogioacchino.delregno@collabora.com> > > --- > > .../bindings/media/mediatek,vcodec-subdev-decoder.yaml | 8 > > ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git > > a/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev- > > decoder.yaml > > b/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev- > > decoder.yaml > > index c4f20acdc1f8..67fde48f991c 100644 > > --- a/Documentation/devicetree/bindings/media/mediatek,vcodec- > > subdev-decoder.yaml > > +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec- > > subdev-decoder.yaml > > @@ -91,7 +91,7 @@ properties: > > > > # Required child node: > > patternProperties: > > - '^vcodec-lat@[0-9a-f]+$': > > + '^video-codec-lat@[0-9a-f]+$': > > Just 'video-codec' doesn't work? > Thanks for your reply. hmm, I think 'vidoe-codec' does wrok. There are two seperate hardwares for the MTK video codec. codec-lat and codec-core. Is it ok to keep two child node names for various hardwares? Thanks, Allen > > type: object > > > > properties: > > @@ -145,7 +145,7 @@ patternProperties: > > > > additionalProperties: false > > > > - '^vcodec-core@[0-9a-f]+$': > > + '^video-codec-core@[0-9a-f]+$': > > type: object > > > > properties: > > @@ -241,7 +241,7 @@ examples: > > #size-cells = <2>; > > ranges = <0 0 0 0x16000000 0 0x40000>; > > reg = <0 0x16000000 0 0x1000>; /* VDEC_SYS */ > > - vcodec-lat@10000 { > > + video-codec-lat@10000 { > > compatible = "mediatek,mtk-vcodec-lat"; > > reg = <0 0x10000 0 0x800>; > > interrupts = <GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH 0>; > > @@ -264,7 +264,7 @@ examples: > > power-domains = <&spm MT8192_POWER_DOMAIN_VDEC>; > > }; > > > > - vcodec-core@25000 { > > + video-codec-core@25000 { > > compatible = "mediatek,mtk-vcodec-core"; > > reg = <0 0x25000 0 0x1000>; > > interrupts = <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH 0>; > > -- > > 2.18.0 > > > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v4 1/2] media: dt-bindings: mediatek: Rename child node names for decoder 2022-10-05 7:21 ` Allen-KH Cheng (程冠勳) @ 2022-10-05 7:30 ` Krzysztof Kozlowski 2022-10-05 11:58 ` Allen-KH Cheng (程冠勳) 0 siblings, 1 reply; 16+ messages in thread From: Krzysztof Kozlowski @ 2022-10-05 7:30 UTC (permalink / raw) To: Allen-KH Cheng (程冠勳), robh Cc: linux-kernel, linux-mediatek, linux-media, devicetree, mchehab, Project_Global_Chrome_Upstream_Group, linux-arm-kernel, matthias.bgg On 05/10/2022 09:21, Allen-KH Cheng (程冠勳) wrote: > Hi Rob, > > On Fri, 2022-09-30 at 17:00 -0500, Rob Herring wrote: >> On Fri, Sep 30, 2022 at 07:22:36PM +0800, Allen-KH Cheng wrote: >>> In order to make the names of the child nodes more generic, we >>> rename >>> "vcodec" to "video-codec" for decoder in patternProperties and >>> example. >> >> They are either generic or they aren't. Until something generic is >> defined, I don't think it's worth the churn to change. >> >> >>> Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> >>> Reviewed-by: AngeloGioacchino Del Regno < >>> angelogioacchino.delregno@collabora.com> >>> --- >>> .../bindings/media/mediatek,vcodec-subdev-decoder.yaml | 8 >>> ++++---- >>> 1 file changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git >>> a/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev- >>> decoder.yaml >>> b/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev- >>> decoder.yaml >>> index c4f20acdc1f8..67fde48f991c 100644 >>> --- a/Documentation/devicetree/bindings/media/mediatek,vcodec- >>> subdev-decoder.yaml >>> +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec- >>> subdev-decoder.yaml >>> @@ -91,7 +91,7 @@ properties: >>> >>> # Required child node: >>> patternProperties: >>> - '^vcodec-lat@[0-9a-f]+$': >>> + '^video-codec-lat@[0-9a-f]+$': >> >> Just 'video-codec' doesn't work? >> > > Thanks for your reply. > > hmm, I think 'vidoe-codec' does wrok. > > There are two seperate hardwares for the MTK video codec. > codec-lat and codec-core. > > Is it ok to keep two child node names for various hardwares? > Aren't they still codecs? Best regards, Krzysztof _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v4 1/2] media: dt-bindings: mediatek: Rename child node names for decoder 2022-10-05 7:30 ` Krzysztof Kozlowski @ 2022-10-05 11:58 ` Allen-KH Cheng (程冠勳) 2022-11-24 11:05 ` Hans Verkuil 0 siblings, 1 reply; 16+ messages in thread From: Allen-KH Cheng (程冠勳) @ 2022-10-05 11:58 UTC (permalink / raw) To: robh, krzysztof.kozlowski Cc: linux-kernel, linux-mediatek, linux-media, devicetree, mchehab, Project_Global_Chrome_Upstream_Group, linux-arm-kernel, matthias.bgg Hi Krzysztof, On Wed, 2022-10-05 at 09:30 +0200, Krzysztof Kozlowski wrote: > On 05/10/2022 09:21, Allen-KH Cheng (程冠勳) wrote: > > Hi Rob, > > > > On Fri, 2022-09-30 at 17:00 -0500, Rob Herring wrote: > > > On Fri, Sep 30, 2022 at 07:22:36PM +0800, Allen-KH Cheng wrote: > > > > In order to make the names of the child nodes more generic, we > > > > rename > > > > "vcodec" to "video-codec" for decoder in patternProperties and > > > > example. > > > > > > They are either generic or they aren't. Until something generic > > > is > > > defined, I don't think it's worth the churn to change. > > > > > > > > > > Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> > > > > Reviewed-by: AngeloGioacchino Del Regno < > > > > angelogioacchino.delregno@collabora.com> > > > > --- > > > > .../bindings/media/mediatek,vcodec-subdev-decoder.yaml | 8 > > > > ++++---- > > > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > > > > > diff --git > > > > a/Documentation/devicetree/bindings/media/mediatek,vcodec- > > > > subdev- > > > > decoder.yaml > > > > b/Documentation/devicetree/bindings/media/mediatek,vcodec- > > > > subdev- > > > > decoder.yaml > > > > index c4f20acdc1f8..67fde48f991c 100644 > > > > --- a/Documentation/devicetree/bindings/media/mediatek,vcodec- > > > > subdev-decoder.yaml > > > > +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec- > > > > subdev-decoder.yaml > > > > @@ -91,7 +91,7 @@ properties: > > > > > > > > # Required child node: > > > > patternProperties: > > > > - '^vcodec-lat@[0-9a-f]+$': > > > > + '^video-codec-lat@[0-9a-f]+$': > > > > > > Just 'video-codec' doesn't work? > > > > > > > Thanks for your reply. > > > > hmm, I think 'vidoe-codec' does wrok. > > > > There are two seperate hardwares for the MTK video codec. > > codec-lat and codec-core. > > > > Is it ok to keep two child node names for various hardwares? > > > > Aren't they still codecs? > > Best regards, > Krzysztof Yes, They are both hardware deocders. Lat is responsible for the bitstream and write the outcome to the lat buffer. Core will decode the lat buffer and write the outcome to the output buffer. Each frame will be decoded cyclically by these two hardware deocders. Thanks, Allen > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v4 1/2] media: dt-bindings: mediatek: Rename child node names for decoder 2022-10-05 11:58 ` Allen-KH Cheng (程冠勳) @ 2022-11-24 11:05 ` Hans Verkuil 2022-11-24 11:09 ` Krzysztof Kozlowski 0 siblings, 1 reply; 16+ messages in thread From: Hans Verkuil @ 2022-11-24 11:05 UTC (permalink / raw) To: Allen-KH Cheng (程冠勳), robh, krzysztof.kozlowski Cc: linux-kernel, linux-mediatek, linux-media, devicetree, mchehab, Project_Global_Chrome_Upstream_Group, linux-arm-kernel, matthias.bgg Hi Krzysztof, On 05/10/2022 13:58, Allen-KH Cheng (程冠勳) wrote: > Hi Krzysztof, > > On Wed, 2022-10-05 at 09:30 +0200, Krzysztof Kozlowski wrote: >> On 05/10/2022 09:21, Allen-KH Cheng (程冠勳) wrote: >>> Hi Rob, >>> >>> On Fri, 2022-09-30 at 17:00 -0500, Rob Herring wrote: >>>> On Fri, Sep 30, 2022 at 07:22:36PM +0800, Allen-KH Cheng wrote: >>>>> In order to make the names of the child nodes more generic, we >>>>> rename >>>>> "vcodec" to "video-codec" for decoder in patternProperties and >>>>> example. >>>> >>>> They are either generic or they aren't. Until something generic >>>> is >>>> defined, I don't think it's worth the churn to change. >>>> >>>> >>>>> Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> >>>>> Reviewed-by: AngeloGioacchino Del Regno < >>>>> angelogioacchino.delregno@collabora.com> >>>>> --- >>>>> .../bindings/media/mediatek,vcodec-subdev-decoder.yaml | 8 >>>>> ++++---- >>>>> 1 file changed, 4 insertions(+), 4 deletions(-) >>>>> >>>>> diff --git >>>>> a/Documentation/devicetree/bindings/media/mediatek,vcodec- >>>>> subdev- >>>>> decoder.yaml >>>>> b/Documentation/devicetree/bindings/media/mediatek,vcodec- >>>>> subdev- >>>>> decoder.yaml >>>>> index c4f20acdc1f8..67fde48f991c 100644 >>>>> --- a/Documentation/devicetree/bindings/media/mediatek,vcodec- >>>>> subdev-decoder.yaml >>>>> +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec- >>>>> subdev-decoder.yaml >>>>> @@ -91,7 +91,7 @@ properties: >>>>> >>>>> # Required child node: >>>>> patternProperties: >>>>> - '^vcodec-lat@[0-9a-f]+$': >>>>> + '^video-codec-lat@[0-9a-f]+$': >>>> >>>> Just 'video-codec' doesn't work? >>>> >>> >>> Thanks for your reply. >>> >>> hmm, I think 'vidoe-codec' does wrok. >>> >>> There are two seperate hardwares for the MTK video codec. >>> codec-lat and codec-core. >>> >>> Is it ok to keep two child node names for various hardwares? >>> >> >> Aren't they still codecs? >> >> Best regards, >> Krzysztof > > Yes, They are both hardware deocders. Lat is responsible for the > bitstream and write the outcome to the lat buffer. Core will decode the > lat buffer and write the outcome to the output buffer. Each frame will > be decoded cyclically by these two hardware deocders. So is this patch OK to be merged? Or do you still want changes? Regards, Hans _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v4 1/2] media: dt-bindings: mediatek: Rename child node names for decoder 2022-11-24 11:05 ` Hans Verkuil @ 2022-11-24 11:09 ` Krzysztof Kozlowski 2022-11-25 9:28 ` Allen-KH Cheng (程冠勳) 0 siblings, 1 reply; 16+ messages in thread From: Krzysztof Kozlowski @ 2022-11-24 11:09 UTC (permalink / raw) To: Hans Verkuil, Allen-KH Cheng (程冠勳), robh Cc: linux-kernel, linux-mediatek, linux-media, devicetree, mchehab, Project_Global_Chrome_Upstream_Group, linux-arm-kernel, matthias.bgg On 24/11/2022 12:05, Hans Verkuil wrote: > Hi Krzysztof, > > On 05/10/2022 13:58, Allen-KH Cheng (程冠勳) wrote: >> Hi Krzysztof, >> >> On Wed, 2022-10-05 at 09:30 +0200, Krzysztof Kozlowski wrote: >>> On 05/10/2022 09:21, Allen-KH Cheng (程冠勳) wrote: >>>> Hi Rob, >>>> >>>> On Fri, 2022-09-30 at 17:00 -0500, Rob Herring wrote: >>>>> On Fri, Sep 30, 2022 at 07:22:36PM +0800, Allen-KH Cheng wrote: >>>>>> In order to make the names of the child nodes more generic, we >>>>>> rename >>>>>> "vcodec" to "video-codec" for decoder in patternProperties and >>>>>> example. >>>>> >>>>> They are either generic or they aren't. Until something generic >>>>> is >>>>> defined, I don't think it's worth the churn to change. >>>>> >>>>> >>>>>> Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> >>>>>> Reviewed-by: AngeloGioacchino Del Regno < >>>>>> angelogioacchino.delregno@collabora.com> >>>>>> --- >>>>>> .../bindings/media/mediatek,vcodec-subdev-decoder.yaml | 8 >>>>>> ++++---- >>>>>> 1 file changed, 4 insertions(+), 4 deletions(-) >>>>>> >>>>>> diff --git >>>>>> a/Documentation/devicetree/bindings/media/mediatek,vcodec- >>>>>> subdev- >>>>>> decoder.yaml >>>>>> b/Documentation/devicetree/bindings/media/mediatek,vcodec- >>>>>> subdev- >>>>>> decoder.yaml >>>>>> index c4f20acdc1f8..67fde48f991c 100644 >>>>>> --- a/Documentation/devicetree/bindings/media/mediatek,vcodec- >>>>>> subdev-decoder.yaml >>>>>> +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec- >>>>>> subdev-decoder.yaml >>>>>> @@ -91,7 +91,7 @@ properties: >>>>>> >>>>>> # Required child node: >>>>>> patternProperties: >>>>>> - '^vcodec-lat@[0-9a-f]+$': >>>>>> + '^video-codec-lat@[0-9a-f]+$': >>>>> >>>>> Just 'video-codec' doesn't work? >>>>> >>>> >>>> Thanks for your reply. >>>> >>>> hmm, I think 'vidoe-codec' does wrok. >>>> >>>> There are two seperate hardwares for the MTK video codec. >>>> codec-lat and codec-core. >>>> >>>> Is it ok to keep two child node names for various hardwares? >>>> >>> >>> Aren't they still codecs? >>> >>> Best regards, >>> Krzysztof >> >> Yes, They are both hardware deocders. Lat is responsible for the >> bitstream and write the outcome to the lat buffer. Core will decode the >> lat buffer and write the outcome to the output buffer. Each frame will >> be decoded cyclically by these two hardware deocders. > > So is this patch OK to be merged? Or do you still want changes? The patch should be changed as Rob pointed out - use "video-codec" name. Best regards, Krzysztof _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v4 1/2] media: dt-bindings: mediatek: Rename child node names for decoder 2022-11-24 11:09 ` Krzysztof Kozlowski @ 2022-11-25 9:28 ` Allen-KH Cheng (程冠勳) 0 siblings, 0 replies; 16+ messages in thread From: Allen-KH Cheng (程冠勳) @ 2022-11-25 9:28 UTC (permalink / raw) To: robh, krzysztof.kozlowski, hverkuil Cc: linux-kernel, linux-mediatek, linux-media, devicetree, mchehab, Project_Global_Chrome_Upstream_Group, linux-arm-kernel, matthias.bgg On Thu, 2022-11-24 at 12:09 +0100, Krzysztof Kozlowski wrote: > On 24/11/2022 12:05, Hans Verkuil wrote: > > Hi Krzysztof, > > > > On 05/10/2022 13:58, Allen-KH Cheng (程冠勳) wrote: > > > Hi Krzysztof, > > > > > > On Wed, 2022-10-05 at 09:30 +0200, Krzysztof Kozlowski wrote: > > > > On 05/10/2022 09:21, Allen-KH Cheng (程冠勳) wrote: > > > > > Hi Rob, > > > > > > > > > > On Fri, 2022-09-30 at 17:00 -0500, Rob Herring wrote: > > > > > > On Fri, Sep 30, 2022 at 07:22:36PM +0800, Allen-KH Cheng > > > > > > wrote: > > > > > > > In order to make the names of the child nodes more > > > > > > > generic, we > > > > > > > rename > > > > > > > "vcodec" to "video-codec" for decoder in > > > > > > > patternProperties and > > > > > > > example. > > > > > > > > > > > > They are either generic or they aren't. Until something > > > > > > generic > > > > > > is > > > > > > defined, I don't think it's worth the churn to change. > > > > > > > > > > > > > > > > > > > Signed-off-by: Allen-KH Cheng < > > > > > > > allen-kh.cheng@mediatek.com> > > > > > > > Reviewed-by: AngeloGioacchino Del Regno < > > > > > > > angelogioacchino.delregno@collabora.com> > > > > > > > --- > > > > > > > .../bindings/media/mediatek,vcodec-subdev- > > > > > > > decoder.yaml | 8 > > > > > > > ++++---- > > > > > > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > > > > > > > > > > > diff --git > > > > > > > a/Documentation/devicetree/bindings/media/mediatek,vcodec > > > > > > > - > > > > > > > subdev- > > > > > > > decoder.yaml > > > > > > > b/Documentation/devicetree/bindings/media/mediatek,vcodec > > > > > > > - > > > > > > > subdev- > > > > > > > decoder.yaml > > > > > > > index c4f20acdc1f8..67fde48f991c 100644 > > > > > > > --- > > > > > > > a/Documentation/devicetree/bindings/media/mediatek,vcodec > > > > > > > - > > > > > > > subdev-decoder.yaml > > > > > > > +++ > > > > > > > b/Documentation/devicetree/bindings/media/mediatek,vcodec > > > > > > > - > > > > > > > subdev-decoder.yaml > > > > > > > @@ -91,7 +91,7 @@ properties: > > > > > > > > > > > > > > # Required child node: > > > > > > > patternProperties: > > > > > > > - '^vcodec-lat@[0-9a-f]+$': > > > > > > > + '^video-codec-lat@[0-9a-f]+$': > > > > > > > > > > > > Just 'video-codec' doesn't work? > > > > > > > > > > > > > > > > Thanks for your reply. > > > > > > > > > > hmm, I think 'vidoe-codec' does wrok. > > > > > > > > > > There are two seperate hardwares for the MTK video codec. > > > > > codec-lat and codec-core. > > > > > > > > > > Is it ok to keep two child node names for various hardwares? > > > > > > > > > > > > > Aren't they still codecs? > > > > > > > > Best regards, > > > > Krzysztof > > > > > > Yes, They are both hardware deocders. Lat is responsible for the > > > bitstream and write the outcome to the lat buffer. Core will > > > decode the > > > lat buffer and write the outcome to the output buffer. Each frame > > > will > > > be decoded cyclically by these two hardware deocders. > > > > So is this patch OK to be merged? Or do you still want changes? > > The patch should be changed as Rob pointed out - use "video-codec" > name. > > Best regards, > Krzysztof > Ok, I will update this. Thanks, Allen _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v4 1/2] media: dt-bindings: mediatek: Rename child node names for decoder 2022-09-30 11:22 ` [PATCH v4 1/2] media: dt-bindings: mediatek: Rename child node names for decoder Allen-KH Cheng 2022-09-30 22:00 ` Rob Herring @ 2022-10-03 13:26 ` Krzysztof Kozlowski 1 sibling, 0 replies; 16+ messages in thread From: Krzysztof Kozlowski @ 2022-10-03 13:26 UTC (permalink / raw) To: Allen-KH Cheng, Mauro Carvalho Chehab, Matthias Brugger, Rob Herring Cc: Project_Global_Chrome_Upstream_Group, linux-media, devicetree, linux-arm-kernel, linux-kernel, linux-mediatek On 30/09/2022 13:22, Allen-KH Cheng wrote: > In order to make the names of the child nodes more generic, we rename > "vcodec" to "video-codec" for decoder in patternProperties and example. > > Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > .../bindings/media/mediatek,vcodec-subdev-decoder.yaml | 8 ++++---- Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v4 2/2] arm64: dts: mt8192: Add vcodec lat and core nodes 2022-09-30 11:22 [PATCH v4 0/2] Add vcodec lat and core nodes for mt8192 Allen-KH Cheng 2022-09-30 11:22 ` [PATCH v4 1/2] media: dt-bindings: mediatek: Rename child node names for decoder Allen-KH Cheng @ 2022-09-30 11:22 ` Allen-KH Cheng 2022-10-06 18:44 ` Nícolas F. R. A. Prado 2022-11-18 14:10 ` Nícolas F. R. A. Prado 2022-11-18 7:12 ` [PATCH v4 0/2] Add vcodec lat and core nodes for mt8192 Allen-KH Cheng (程冠勳) 2 siblings, 2 replies; 16+ messages in thread From: Allen-KH Cheng @ 2022-09-30 11:22 UTC (permalink / raw) To: Mauro Carvalho Chehab, Matthias Brugger, Rob Herring, Krzysztof Kozlowski Cc: Project_Global_Chrome_Upstream_Group, linux-media, devicetree, linux-arm-kernel, linux-kernel, linux-mediatek, Allen-KH Cheng Add vcodec lat and core nodes for mt8192 SoC. Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> Tested-by: Chen-Yu Tsai <wenst@chromium.org> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- arch/arm64/boot/dts/mediatek/mt8192.dtsi | 60 ++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8192.dtsi b/arch/arm64/boot/dts/mediatek/mt8192.dtsi index 6b20376191a7..92a20f87468b 100644 --- a/arch/arm64/boot/dts/mediatek/mt8192.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8192.dtsi @@ -1449,6 +1449,66 @@ power-domains = <&spm MT8192_POWER_DOMAIN_ISP2>; }; + vcodec_dec: video-codec@16000000 { + compatible = "mediatek,mt8192-vcodec-dec"; + reg = <0 0x16000000 0 0x1000>; + mediatek,scp = <&scp>; + iommus = <&iommu0 M4U_PORT_L4_VDEC_MC_EXT>; + dma-ranges = <0x1 0x0 0x0 0x40000000 0x0 0xfff00000>; + #address-cells = <2>; + #size-cells = <2>; + ranges = <0 0 0 0x16000000 0 0x26000>; + + video-codec-lat@10000 { + compatible = "mediatek,mtk-vcodec-lat"; + reg = <0x0 0x10000 0 0x800>; + interrupts = <GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH 0>; + iommus = <&iommu0 M4U_PORT_L5_VDEC_LAT0_VLD_EXT>, + <&iommu0 M4U_PORT_L5_VDEC_LAT0_VLD2_EXT>, + <&iommu0 M4U_PORT_L5_VDEC_LAT0_AVC_MV_EXT>, + <&iommu0 M4U_PORT_L5_VDEC_LAT0_PRED_RD_EXT>, + <&iommu0 M4U_PORT_L5_VDEC_LAT0_TILE_EXT>, + <&iommu0 M4U_PORT_L5_VDEC_LAT0_WDMA_EXT>, + <&iommu0 M4U_PORT_L5_VDEC_LAT0_RG_CTRL_DMA_EXT>, + <&iommu0 M4U_PORT_L5_VDEC_UFO_ENC_EXT>; + clocks = <&topckgen CLK_TOP_VDEC_SEL>, + <&vdecsys_soc CLK_VDEC_SOC_VDEC>, + <&vdecsys_soc CLK_VDEC_SOC_LAT>, + <&vdecsys_soc CLK_VDEC_SOC_LARB1>, + <&topckgen CLK_TOP_MAINPLL_D4>; + clock-names = "sel", "soc-vdec", "soc-lat", "vdec", "top"; + assigned-clocks = <&topckgen CLK_TOP_VDEC_SEL>; + assigned-clock-parents = <&topckgen CLK_TOP_MAINPLL_D4>; + power-domains = <&spm MT8192_POWER_DOMAIN_VDEC>; + }; + + video-codec-core@25000 { + compatible = "mediatek,mtk-vcodec-core"; + reg = <0 0x25000 0 0x1000>; + interrupts = <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH 0>; + iommus = <&iommu0 M4U_PORT_L4_VDEC_MC_EXT>, + <&iommu0 M4U_PORT_L4_VDEC_UFO_EXT>, + <&iommu0 M4U_PORT_L4_VDEC_PP_EXT>, + <&iommu0 M4U_PORT_L4_VDEC_PRED_RD_EXT>, + <&iommu0 M4U_PORT_L4_VDEC_PRED_WR_EXT>, + <&iommu0 M4U_PORT_L4_VDEC_PPWRAP_EXT>, + <&iommu0 M4U_PORT_L4_VDEC_TILE_EXT>, + <&iommu0 M4U_PORT_L4_VDEC_VLD_EXT>, + <&iommu0 M4U_PORT_L4_VDEC_VLD2_EXT>, + <&iommu0 M4U_PORT_L4_VDEC_AVC_MV_EXT>, + <&iommu0 M4U_PORT_L4_VDEC_RG_CTRL_DMA_EXT>; + clocks = <&topckgen CLK_TOP_VDEC_SEL>, + <&vdecsys CLK_VDEC_VDEC>, + <&vdecsys CLK_VDEC_LAT>, + <&vdecsys CLK_VDEC_LARB1>, + <&topckgen CLK_TOP_MAINPLL_D4>; + clock-names = "sel", "soc-vdec", "soc-lat", "vdec", "top"; + assigned-clocks = <&topckgen CLK_TOP_VDEC_SEL>; + assigned-clock-parents = <&topckgen CLK_TOP_MAINPLL_D4>; + power-domains = <&spm MT8192_POWER_DOMAIN_VDEC2>; + }; + }; + larb5: larb@1600d000 { compatible = "mediatek,mt8192-smi-larb"; reg = <0 0x1600d000 0 0x1000>; -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH v4 2/2] arm64: dts: mt8192: Add vcodec lat and core nodes 2022-09-30 11:22 ` [PATCH v4 2/2] arm64: dts: mt8192: Add vcodec lat and core nodes Allen-KH Cheng @ 2022-10-06 18:44 ` Nícolas F. R. A. Prado 2022-11-18 14:10 ` Nícolas F. R. A. Prado 1 sibling, 0 replies; 16+ messages in thread From: Nícolas F. R. A. Prado @ 2022-10-06 18:44 UTC (permalink / raw) To: Allen-KH Cheng Cc: Mauro Carvalho Chehab, Matthias Brugger, Rob Herring, Krzysztof Kozlowski, Project_Global_Chrome_Upstream_Group, linux-media, devicetree, linux-arm-kernel, linux-kernel, linux-mediatek Hi, On Fri, Sep 30, 2022 at 07:22:37PM +0800, Allen-KH Cheng wrote: > Add vcodec lat and core nodes for mt8192 SoC. > > Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> > Tested-by: Chen-Yu Tsai <wenst@chromium.org> > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Thanks, Nícolas _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v4 2/2] arm64: dts: mt8192: Add vcodec lat and core nodes 2022-09-30 11:22 ` [PATCH v4 2/2] arm64: dts: mt8192: Add vcodec lat and core nodes Allen-KH Cheng 2022-10-06 18:44 ` Nícolas F. R. A. Prado @ 2022-11-18 14:10 ` Nícolas F. R. A. Prado 2022-11-21 12:30 ` Allen-KH Cheng (程冠勳) 1 sibling, 1 reply; 16+ messages in thread From: Nícolas F. R. A. Prado @ 2022-11-18 14:10 UTC (permalink / raw) To: Allen-KH Cheng Cc: Mauro Carvalho Chehab, Matthias Brugger, Rob Herring, Krzysztof Kozlowski, Project_Global_Chrome_Upstream_Group, linux-media, devicetree, linux-arm-kernel, linux-kernel, linux-mediatek On Fri, Sep 30, 2022 at 07:22:37PM +0800, Allen-KH Cheng wrote: > Add vcodec lat and core nodes for mt8192 SoC. > > Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> > Tested-by: Chen-Yu Tsai <wenst@chromium.org> > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > arch/arm64/boot/dts/mediatek/mt8192.dtsi | 60 ++++++++++++++++++++++++ > 1 file changed, 60 insertions(+) > > diff --git a/arch/arm64/boot/dts/mediatek/mt8192.dtsi b/arch/arm64/boot/dts/mediatek/mt8192.dtsi > index 6b20376191a7..92a20f87468b 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8192.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8192.dtsi > @@ -1449,6 +1449,66 @@ > power-domains = <&spm MT8192_POWER_DOMAIN_ISP2>; > }; > > + vcodec_dec: video-codec@16000000 { > + compatible = "mediatek,mt8192-vcodec-dec"; > + reg = <0 0x16000000 0 0x1000>; > + mediatek,scp = <&scp>; > + iommus = <&iommu0 M4U_PORT_L4_VDEC_MC_EXT>; > + dma-ranges = <0x1 0x0 0x0 0x40000000 0x0 0xfff00000>; Hi, since commit 951d48855d86 ("of: Make of_dma_get_range() work on bus nodes") [1] was merged this no longer works as is. Running the fluster codec tests results in IOMMU faults: [ 386.233976] mtk-iommu 1401d000.m4u: fault type=0x280 iova=0x1fcdc0000 pa=0x0 master=0x500041c(larb=4 port=7) layer=0 read [ 386.250666] mtk_vdec_worker(),241: [MTK_V4L2][ERROR] <===[138], src_buf[0] sz=0x298 pts=0 vdec_if_decode() ret=1 res_chg=0===> The issue is that the DMA configuration supplied by dma-ranges is now looked for in the parent node, so the vcodec_dec node no longer gets the configuration it expected. That said, given that the node already uses the IOMMU for the address translations (iommus property), there shouldn't even be a dma-ranges property. Indeed simply removing the dma-ranges property from this node fixes the issue and gets the decoder working again. Thanks, Nícolas [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f1ad5338a4d57fe1fe6475003acb8c70bf9d1bdf > + #address-cells = <2>; > + #size-cells = <2>; > + ranges = <0 0 0 0x16000000 0 0x26000>; > + > + video-codec-lat@10000 { > + compatible = "mediatek,mtk-vcodec-lat"; > + reg = <0x0 0x10000 0 0x800>; > + interrupts = <GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH 0>; > + iommus = <&iommu0 M4U_PORT_L5_VDEC_LAT0_VLD_EXT>, > + <&iommu0 M4U_PORT_L5_VDEC_LAT0_VLD2_EXT>, > + <&iommu0 M4U_PORT_L5_VDEC_LAT0_AVC_MV_EXT>, > + <&iommu0 M4U_PORT_L5_VDEC_LAT0_PRED_RD_EXT>, > + <&iommu0 M4U_PORT_L5_VDEC_LAT0_TILE_EXT>, > + <&iommu0 M4U_PORT_L5_VDEC_LAT0_WDMA_EXT>, > + <&iommu0 M4U_PORT_L5_VDEC_LAT0_RG_CTRL_DMA_EXT>, > + <&iommu0 M4U_PORT_L5_VDEC_UFO_ENC_EXT>; > + clocks = <&topckgen CLK_TOP_VDEC_SEL>, > + <&vdecsys_soc CLK_VDEC_SOC_VDEC>, > + <&vdecsys_soc CLK_VDEC_SOC_LAT>, > + <&vdecsys_soc CLK_VDEC_SOC_LARB1>, > + <&topckgen CLK_TOP_MAINPLL_D4>; > + clock-names = "sel", "soc-vdec", "soc-lat", "vdec", "top"; > + assigned-clocks = <&topckgen CLK_TOP_VDEC_SEL>; > + assigned-clock-parents = <&topckgen CLK_TOP_MAINPLL_D4>; > + power-domains = <&spm MT8192_POWER_DOMAIN_VDEC>; > + }; > + > + video-codec-core@25000 { > + compatible = "mediatek,mtk-vcodec-core"; > + reg = <0 0x25000 0 0x1000>; > + interrupts = <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH 0>; > + iommus = <&iommu0 M4U_PORT_L4_VDEC_MC_EXT>, > + <&iommu0 M4U_PORT_L4_VDEC_UFO_EXT>, > + <&iommu0 M4U_PORT_L4_VDEC_PP_EXT>, > + <&iommu0 M4U_PORT_L4_VDEC_PRED_RD_EXT>, > + <&iommu0 M4U_PORT_L4_VDEC_PRED_WR_EXT>, > + <&iommu0 M4U_PORT_L4_VDEC_PPWRAP_EXT>, > + <&iommu0 M4U_PORT_L4_VDEC_TILE_EXT>, > + <&iommu0 M4U_PORT_L4_VDEC_VLD_EXT>, > + <&iommu0 M4U_PORT_L4_VDEC_VLD2_EXT>, > + <&iommu0 M4U_PORT_L4_VDEC_AVC_MV_EXT>, > + <&iommu0 M4U_PORT_L4_VDEC_RG_CTRL_DMA_EXT>; > + clocks = <&topckgen CLK_TOP_VDEC_SEL>, > + <&vdecsys CLK_VDEC_VDEC>, > + <&vdecsys CLK_VDEC_LAT>, > + <&vdecsys CLK_VDEC_LARB1>, > + <&topckgen CLK_TOP_MAINPLL_D4>; > + clock-names = "sel", "soc-vdec", "soc-lat", "vdec", "top"; > + assigned-clocks = <&topckgen CLK_TOP_VDEC_SEL>; > + assigned-clock-parents = <&topckgen CLK_TOP_MAINPLL_D4>; > + power-domains = <&spm MT8192_POWER_DOMAIN_VDEC2>; > + }; > + }; > + _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v4 2/2] arm64: dts: mt8192: Add vcodec lat and core nodes 2022-11-18 14:10 ` Nícolas F. R. A. Prado @ 2022-11-21 12:30 ` Allen-KH Cheng (程冠勳) 2022-11-21 14:23 ` Nícolas F. R. A. Prado 0 siblings, 1 reply; 16+ messages in thread From: Allen-KH Cheng (程冠勳) @ 2022-11-21 12:30 UTC (permalink / raw) To: nfraprado Cc: linux-kernel, robh+dt, linux-mediatek, linux-media, devicetree, mchehab, krzysztof.kozlowski, Project_Global_Chrome_Upstream_Group, linux-arm-kernel, matthias.bgg Hi Nícolas, On Fri, 2022-11-18 at 09:10 -0500, Nícolas F. R. A. Prado wrote: > On Fri, Sep 30, 2022 at 07:22:37PM +0800, Allen-KH Cheng wrote: > > Add vcodec lat and core nodes for mt8192 SoC. > > > > Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> > > Tested-by: Chen-Yu Tsai <wenst@chromium.org> > > Reviewed-by: AngeloGioacchino Del Regno < > > angelogioacchino.delregno@collabora.com> > > --- > > arch/arm64/boot/dts/mediatek/mt8192.dtsi | 60 > > ++++++++++++++++++++++++ > > 1 file changed, 60 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/mediatek/mt8192.dtsi > > b/arch/arm64/boot/dts/mediatek/mt8192.dtsi > > index 6b20376191a7..92a20f87468b 100644 > > --- a/arch/arm64/boot/dts/mediatek/mt8192.dtsi > > +++ b/arch/arm64/boot/dts/mediatek/mt8192.dtsi > > @@ -1449,6 +1449,66 @@ > > power-domains = <&spm > > MT8192_POWER_DOMAIN_ISP2>; > > }; > > > > + vcodec_dec: video-codec@16000000 { > > + compatible = "mediatek,mt8192-vcodec-dec"; > > + reg = <0 0x16000000 0 0x1000>; > > + mediatek,scp = <&scp>; > > + iommus = <&iommu0 M4U_PORT_L4_VDEC_MC_EXT>; > > + dma-ranges = <0x1 0x0 0x0 0x40000000 0x0 > > 0xfff00000>; > > Hi, > > since commit 951d48855d86 ("of: Make of_dma_get_range() work on bus > nodes") [1] > was merged this no longer works as is. Running the fluster codec > tests results > in IOMMU faults: > > [ 386.233976] mtk-iommu 1401d000.m4u: fault type=0x280 > iova=0x1fcdc0000 pa=0x0 master=0x500041c(larb=4 port=7) layer=0 read > [ 386.250666] mtk_vdec_worker(),241: > [MTK_V4L2][ERROR] <===[138], src_buf[0] sz=0x298 pts=0 > vdec_if_decode() ret=1 res_chg=0===> > > The issue is that the DMA configuration supplied by dma-ranges is now > looked for > in the parent node, so the vcodec_dec node no longer gets the > configuration it > expected. > > That said, given that the node already uses the IOMMU for the address > translations (iommus property), there shouldn't even be a dma-ranges > property. > Indeed simply removing the dma-ranges property from this node fixes > the issue > and gets the decoder working again. > > Thanks, > Nícolas > > [1] > https://urldefense.com/v3/__https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f1ad5338a4d57fe1fe6475003acb8c70bf9d1bdf__;!!CTRNKA9wMg0ARbw!xdhhnvXMY5-BjI2BXPHQI-Hw8zgtZ1lvFyFFv7KtNuCDxW17VC7RqAaW9B_uXsQucT1sLk_DUl-c99ijF9dF8QXbJQ$ > Noted! The paret node should be vcodec_dec: video-codec@16000000 { compatible = "mediatek,mt8192-vcodec-dec"; reg = <0 0x16000000 0 0x1000>; mediatek,scp = <&scp>; iommus = <&iommu0 M4U_PORT_L4_VDEC_MC_EXT>; #address-cells = <2>; #size-cells = <2>; ranges = <0 0 0 0x16000000 0 0x26000>; video-codec-lat@10000 { ... } Am I right? Thanks, Allen > > > + #address-cells = <2>; > > + #size-cells = <2>; > > + ranges = <0 0 0 0x16000000 0 0x26000>; > > + > > + video-codec-lat@10000 { > > + compatible = "mediatek,mtk-vcodec-lat"; > > + reg = <0x0 0x10000 0 0x800>; > > + interrupts = <GIC_SPI 426 > > IRQ_TYPE_LEVEL_HIGH 0>; > > + iommus = <&iommu0 > > M4U_PORT_L5_VDEC_LAT0_VLD_EXT>, > > + <&iommu0 > > M4U_PORT_L5_VDEC_LAT0_VLD2_EXT>, > > + <&iommu0 > > M4U_PORT_L5_VDEC_LAT0_AVC_MV_EXT>, > > + <&iommu0 > > M4U_PORT_L5_VDEC_LAT0_PRED_RD_EXT>, > > + <&iommu0 > > M4U_PORT_L5_VDEC_LAT0_TILE_EXT>, > > + <&iommu0 > > M4U_PORT_L5_VDEC_LAT0_WDMA_EXT>, > > + <&iommu0 > > M4U_PORT_L5_VDEC_LAT0_RG_CTRL_DMA_EXT>, > > + <&iommu0 > > M4U_PORT_L5_VDEC_UFO_ENC_EXT>; > > + clocks = <&topckgen CLK_TOP_VDEC_SEL>, > > + <&vdecsys_soc > > CLK_VDEC_SOC_VDEC>, > > + <&vdecsys_soc > > CLK_VDEC_SOC_LAT>, > > + <&vdecsys_soc > > CLK_VDEC_SOC_LARB1>, > > + <&topckgen > > CLK_TOP_MAINPLL_D4>; > > + clock-names = "sel", "soc-vdec", "soc- > > lat", "vdec", "top"; > > + assigned-clocks = <&topckgen > > CLK_TOP_VDEC_SEL>; > > + assigned-clock-parents = <&topckgen > > CLK_TOP_MAINPLL_D4>; > > + power-domains = <&spm > > MT8192_POWER_DOMAIN_VDEC>; > > + }; > > + > > + video-codec-core@25000 { > > + compatible = "mediatek,mtk-vcodec- > > core"; > > + reg = <0 0x25000 0 0x1000>; > > + interrupts = <GIC_SPI 425 > > IRQ_TYPE_LEVEL_HIGH 0>; > > + iommus = <&iommu0 > > M4U_PORT_L4_VDEC_MC_EXT>, > > + <&iommu0 > > M4U_PORT_L4_VDEC_UFO_EXT>, > > + <&iommu0 > > M4U_PORT_L4_VDEC_PP_EXT>, > > + <&iommu0 > > M4U_PORT_L4_VDEC_PRED_RD_EXT>, > > + <&iommu0 > > M4U_PORT_L4_VDEC_PRED_WR_EXT>, > > + <&iommu0 > > M4U_PORT_L4_VDEC_PPWRAP_EXT>, > > + <&iommu0 > > M4U_PORT_L4_VDEC_TILE_EXT>, > > + <&iommu0 > > M4U_PORT_L4_VDEC_VLD_EXT>, > > + <&iommu0 > > M4U_PORT_L4_VDEC_VLD2_EXT>, > > + <&iommu0 > > M4U_PORT_L4_VDEC_AVC_MV_EXT>, > > + <&iommu0 > > M4U_PORT_L4_VDEC_RG_CTRL_DMA_EXT>; > > + clocks = <&topckgen CLK_TOP_VDEC_SEL>, > > + <&vdecsys CLK_VDEC_VDEC>, > > + <&vdecsys CLK_VDEC_LAT>, > > + <&vdecsys CLK_VDEC_LARB1>, > > + <&topckgen > > CLK_TOP_MAINPLL_D4>; > > + clock-names = "sel", "soc-vdec", "soc- > > lat", "vdec", "top"; > > + assigned-clocks = <&topckgen > > CLK_TOP_VDEC_SEL>; > > + assigned-clock-parents = <&topckgen > > CLK_TOP_MAINPLL_D4>; > > + power-domains = <&spm > > MT8192_POWER_DOMAIN_VDEC2>; > > + }; > > + }; > > + _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v4 2/2] arm64: dts: mt8192: Add vcodec lat and core nodes 2022-11-21 12:30 ` Allen-KH Cheng (程冠勳) @ 2022-11-21 14:23 ` Nícolas F. R. A. Prado 0 siblings, 0 replies; 16+ messages in thread From: Nícolas F. R. A. Prado @ 2022-11-21 14:23 UTC (permalink / raw) To: Allen-KH Cheng (程冠勳) Cc: linux-kernel, robh+dt, linux-mediatek, linux-media, devicetree, mchehab, krzysztof.kozlowski, Project_Global_Chrome_Upstream_Group, linux-arm-kernel, matthias.bgg On Mon, Nov 21, 2022 at 12:30:37PM +0000, Allen-KH Cheng (程冠勳) wrote: > Hi Nícolas, > > On Fri, 2022-11-18 at 09:10 -0500, Nícolas F. R. A. Prado wrote: > > On Fri, Sep 30, 2022 at 07:22:37PM +0800, Allen-KH Cheng wrote: > > > Add vcodec lat and core nodes for mt8192 SoC. > > > > > > Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> > > > Tested-by: Chen-Yu Tsai <wenst@chromium.org> > > > Reviewed-by: AngeloGioacchino Del Regno < > > > angelogioacchino.delregno@collabora.com> > > > --- > > > arch/arm64/boot/dts/mediatek/mt8192.dtsi | 60 > > > ++++++++++++++++++++++++ > > > 1 file changed, 60 insertions(+) > > > > > > diff --git a/arch/arm64/boot/dts/mediatek/mt8192.dtsi > > > b/arch/arm64/boot/dts/mediatek/mt8192.dtsi > > > index 6b20376191a7..92a20f87468b 100644 > > > --- a/arch/arm64/boot/dts/mediatek/mt8192.dtsi > > > +++ b/arch/arm64/boot/dts/mediatek/mt8192.dtsi > > > @@ -1449,6 +1449,66 @@ > > > power-domains = <&spm > > > MT8192_POWER_DOMAIN_ISP2>; > > > }; > > > > > > + vcodec_dec: video-codec@16000000 { > > > + compatible = "mediatek,mt8192-vcodec-dec"; > > > + reg = <0 0x16000000 0 0x1000>; > > > + mediatek,scp = <&scp>; > > > + iommus = <&iommu0 M4U_PORT_L4_VDEC_MC_EXT>; > > > + dma-ranges = <0x1 0x0 0x0 0x40000000 0x0 > > > 0xfff00000>; > > > > Hi, > > > > since commit 951d48855d86 ("of: Make of_dma_get_range() work on bus > > nodes") [1] > > was merged this no longer works as is. Running the fluster codec > > tests results > > in IOMMU faults: > > > > [ 386.233976] mtk-iommu 1401d000.m4u: fault type=0x280 > > iova=0x1fcdc0000 pa=0x0 master=0x500041c(larb=4 port=7) layer=0 read > > [ 386.250666] mtk_vdec_worker(),241: > > [MTK_V4L2][ERROR] <===[138], src_buf[0] sz=0x298 pts=0 > > vdec_if_decode() ret=1 res_chg=0===> > > > > The issue is that the DMA configuration supplied by dma-ranges is now > > looked for > > in the parent node, so the vcodec_dec node no longer gets the > > configuration it > > expected. > > > > That said, given that the node already uses the IOMMU for the address > > translations (iommus property), there shouldn't even be a dma-ranges > > property. > > Indeed simply removing the dma-ranges property from this node fixes > > the issue > > and gets the decoder working again. > > > > Thanks, > > Nícolas > > > > [1] > > https://urldefense.com/v3/__https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f1ad5338a4d57fe1fe6475003acb8c70bf9d1bdf__;!!CTRNKA9wMg0ARbw!xdhhnvXMY5-BjI2BXPHQI-Hw8zgtZ1lvFyFFv7KtNuCDxW17VC7RqAaW9B_uXsQucT1sLk_DUl-c99ijF9dF8QXbJQ$ > > > > Noted! > > The paret node should be > > vcodec_dec: video-codec@16000000 { > compatible = "mediatek,mt8192-vcodec-dec"; > reg = <0 0x16000000 0 0x1000>; > mediatek,scp = <&scp>; > iommus = <&iommu0 M4U_PORT_L4_VDEC_MC_EXT>; > #address-cells = <2>; > #size-cells = <2>; > ranges = <0 0 0 0x16000000 0 0x26000>; > > video-codec-lat@10000 { > ... > > } > > Am I right? Yes, that's right. Thanks, Nícolas _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v4 0/2] Add vcodec lat and core nodes for mt8192 2022-09-30 11:22 [PATCH v4 0/2] Add vcodec lat and core nodes for mt8192 Allen-KH Cheng 2022-09-30 11:22 ` [PATCH v4 1/2] media: dt-bindings: mediatek: Rename child node names for decoder Allen-KH Cheng 2022-09-30 11:22 ` [PATCH v4 2/2] arm64: dts: mt8192: Add vcodec lat and core nodes Allen-KH Cheng @ 2022-11-18 7:12 ` Allen-KH Cheng (程冠勳) 2 siblings, 0 replies; 16+ messages in thread From: Allen-KH Cheng (程冠勳) @ 2022-11-18 7:12 UTC (permalink / raw) To: matthias.bgg, mchehab, krzysztof.kozlowski, robh+dt Cc: linux-arm-kernel, linux-kernel, linux-media, linux-mediatek, Project_Global_Chrome_Upstream_Group, devicetree Hi Matthias, Gentle ping for this series. Does this series look good to you? Thanks, Allen On Fri, 2022-09-30 at 19:22 +0800, Allen-KH Cheng wrote: > This series is based on linux-next, tag: next-20220929. > > Change in v3: > - Drop `vcodec_lat:` and `vcodec_core:` > > Change in v2: > - Add a dt-bindings patch for changing "vcodec" to "video-codec" > - Rename child names for vcodec lat and core nodes > > Change in v1: > - Replace node names with video-codec > [Allen-KH Cheng <allen-kh.cheng@mediatek.com>] > > Allen-KH Cheng (2): > media: dt-bindings: mediatek: Rename child node names for decoder > arm64: dts: mt8192: Add vcodec lat and core nodes > > .../media/mediatek,vcodec-subdev-decoder.yaml | 8 +-- > arch/arm64/boot/dts/mediatek/mt8192.dtsi | 60 > +++++++++++++++++++ > 2 files changed, 64 insertions(+), 4 deletions(-) > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2022-11-25 10:45 UTC | newest] Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-09-30 11:22 [PATCH v4 0/2] Add vcodec lat and core nodes for mt8192 Allen-KH Cheng 2022-09-30 11:22 ` [PATCH v4 1/2] media: dt-bindings: mediatek: Rename child node names for decoder Allen-KH Cheng 2022-09-30 22:00 ` Rob Herring 2022-10-05 7:21 ` Allen-KH Cheng (程冠勳) 2022-10-05 7:30 ` Krzysztof Kozlowski 2022-10-05 11:58 ` Allen-KH Cheng (程冠勳) 2022-11-24 11:05 ` Hans Verkuil 2022-11-24 11:09 ` Krzysztof Kozlowski 2022-11-25 9:28 ` Allen-KH Cheng (程冠勳) 2022-10-03 13:26 ` Krzysztof Kozlowski 2022-09-30 11:22 ` [PATCH v4 2/2] arm64: dts: mt8192: Add vcodec lat and core nodes Allen-KH Cheng 2022-10-06 18:44 ` Nícolas F. R. A. Prado 2022-11-18 14:10 ` Nícolas F. R. A. Prado 2022-11-21 12:30 ` Allen-KH Cheng (程冠勳) 2022-11-21 14:23 ` Nícolas F. R. A. Prado 2022-11-18 7:12 ` [PATCH v4 0/2] Add vcodec lat and core nodes for mt8192 Allen-KH Cheng (程冠勳)
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).