| Message ID | 2b21b160-a530-486a-9404-c5bf8863ffed@freebox.fr |
|---|---|
| Headers | show |
| Series | Add support for qcom msm8998-venus (HW vdec / venc) | expand |
On 29/04/2024 17:15, Marc Gonzalez wrote: > Add YAML binding for Qualcomm MSM8998 Venus HW video encode and decode. > (Based on qcom,msm8996-venus.yaml) > > Signed-off-by: Marc Gonzalez <mgonzalez@freebox.fr> > --- > Documentation/devicetree/bindings/media/qcom,msm8998-venus.yaml | 155 ++++++++++++++++++++++++++++ > 1 file changed, 155 insertions(+) > > diff --git a/Documentation/devicetree/bindings/media/qcom,msm8998-venus.yaml b/Documentation/devicetree/bindings/media/qcom,msm8998-venus.yaml > new file mode 100644 > index 0000000000000..86a20954cb354 > --- /dev/null > +++ b/Documentation/devicetree/bindings/media/qcom,msm8998-venus.yaml > @@ -0,0 +1,155 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/media/qcom,msm8998-venus.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Qualcomm MSM8998 Venus video encode and decode accelerators > + > +maintainers: > + - Stanimir Varbanov <stanimir.varbanov@linaro.org> You should list yourself as maintaining a file you add upstream, plus I'm pretty sure that's not Stan's current email address. However, looking at this I think you should just add a new compat to Documentation/devicetree/bindings/media/qcom,msm8996-venus.yaml since the rest of the file is 1:1 --- bod
On 29/04/2024 17:19, Marc Gonzalez wrote: > From: Pierre-Hugues Husson <phhusson@freebox.fr> > > Add the missing bits for MSM8998 support. > > Signed-off-by: Pierre-Hugues Husson <phhusson@freebox.fr> > Signed-off-by: Marc Gonzalez <mgonzalez@freebox.fr> > --- > drivers/media/platform/qcom/venus/core.c | 42 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > > diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c > index ce206b7097541..42e0c580e093d 100644 > --- a/drivers/media/platform/qcom/venus/core.c > +++ b/drivers/media/platform/qcom/venus/core.c > @@ -587,6 +587,47 @@ static const struct venus_resources msm8996_res = { > .fwname = "qcom/venus-4.2/venus.mbn", > }; > > +static const struct freq_tbl msm8998_freq_table[] = { > + { 1944000, 520000000 }, /* 4k UHD @ 60 (decode only) */ > + { 972000, 520000000 }, /* 4k UHD @ 30 */ > + { 489600, 346666667 }, /* 1080p @ 60 */ > + { 244800, 150000000 }, /* 1080p @ 30 */ > + { 108000, 75000000 }, /* 720p @ 30 */ > +}; > + > +/* > + * https://git.codelinaro.org/clo/la/kernel/msm-4.4/-/blob/caf_migration/kernel.lnx.4.4.r38-rel/arch/arm/boot/dts/qcom/msm8998-vidc.dtsi Nice touch. Does encoding/decoding work on -next sans interconnect support ? I think we discussed on IRC it does but I'll ask again just to confirm. > + */ > +static const struct reg_val msm8998_reg_preset[] = { > + { 0x80124, 0x00000003 }, > + { 0x80550, 0x01111111 }, > + { 0x80560, 0x01111111 }, > + { 0x80568, 0x01111111 }, > + { 0x80570, 0x01111111 }, > + { 0x80580, 0x01111111 }, > + { 0x80588, 0x01111111 }, > + { 0xe2010, 0x00000000 }, > +}; > + > +static const struct venus_resources msm8998_res = { > + .freq_tbl = msm8998_freq_table, > + .freq_tbl_size = ARRAY_SIZE(msm8998_freq_table), > + .reg_tbl = msm8998_reg_preset, > + .reg_tbl_size = ARRAY_SIZE(msm8998_reg_preset), > + .clks = { "core", "iface", "bus", "mbus" }, > + .clks_num = 4, > + .vcodec0_clks = { "core" }, > + .vcodec1_clks = { "core" }, > + .vcodec_clks_num = 1, > + .max_load = 2563200, > + .hfi_version = HFI_VERSION_3XX, > + .vmem_id = VIDC_RESOURCE_NONE, > + .vmem_size = 0, > + .vmem_addr = 0, > + .dma_mask = 0xddc00000 - 1, > + .fwname = "qcom/venus-4.4/venus.mbn", > +}; > + > static const struct freq_tbl sdm660_freq_table[] = { > { 979200, 518400000 }, > { 489600, 441600000 }, > @@ -893,6 +934,7 @@ static const struct venus_resources sc7280_res = { > static const struct of_device_id venus_dt_match[] = { > { .compatible = "qcom,msm8916-venus", .data = &msm8916_res, }, > { .compatible = "qcom,msm8996-venus", .data = &msm8996_res, }, > + { .compatible = "qcom,msm8998-venus", .data = &msm8998_res, }, > { .compatible = "qcom,sdm660-venus", .data = &sdm660_res, }, > { .compatible = "qcom,sdm845-venus", .data = &sdm845_res, }, > { .compatible = "qcom,sdm845-venus-v2", .data = &sdm845_res_v2, }, Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
On 29/04/2024 18:15, Marc Gonzalez wrote: > Add YAML binding for Qualcomm MSM8998 Venus HW video encode and decode. > (Based on qcom,msm8996-venus.yaml) > > Signed-off-by: Marc Gonzalez <mgonzalez@freebox.fr> > --- > Documentation/devicetree/bindings/media/qcom,msm8998-venus.yaml | 155 ++++++++++++++++++++++++++++ > 1 file changed, 155 insertions(+) > > diff --git a/Documentation/devicetree/bindings/media/qcom,msm8998-venus.yaml b/Documentation/devicetree/bindings/media/qcom,msm8998-venus.yaml > new file mode 100644 > index 0000000000000..86a20954cb354 > --- /dev/null > +++ b/Documentation/devicetree/bindings/media/qcom,msm8998-venus.yaml > @@ -0,0 +1,155 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/media/qcom,msm8998-venus.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Qualcomm MSM8998 Venus video encode and decode accelerators > + > +maintainers: > + - Stanimir Varbanov <stanimir.varbanov@linaro.org> > + > +description: | Do not need '|' unless you need to preserve formatting. > + The Venus IP is a video encode and decode accelerator present > + on Qualcomm platforms > + > +allOf: > + - $ref: qcom,venus-common.yaml# > + > +properties: > + compatible: > + const: qcom,msm8998-venus > + > + power-domains: > + maxItems: 1 > + > + clocks: > + maxItems: 4 > + > + clock-names: > + items: > + - const: core > + - const: iface > + - const: bus > + - const: mbus > + > + interconnects: > + maxItems: 2 > + > + interconnect-names: > + items: > + - const: video-mem > + - const: cpu-cfg > + > + iommus: > + maxItems: 20 > + > + video-decoder: > + type: object > + > + properties: > + compatible: > + const: venus-decoder > + > + clocks: > + maxItems: 1 > + > + clock-names: > + items: > + - const: core > + > + power-domains: > + maxItems: 1 > + > + required: > + - compatible > + - clocks > + - clock-names > + - power-domains > + > + additionalProperties: false > + > + video-encoder: > + type: object > + > + properties: > + compatible: > + const: venus-encoder > + > + clocks: > + maxItems: 1 > + > + clock-names: > + items: > + - const: core > + > + power-domains: > + maxItems: 1 > + > + required: > + - compatible > + - clocks > + - clock-names > + - power-domains > + > + additionalProperties: false In nested blocks, put it after the type:object, for readability. > + Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On 30.04.2024 9:54 AM, Krzysztof Kozlowski wrote: > On 29/04/2024 18:15, Marc Gonzalez wrote: >> Add YAML binding for Qualcomm MSM8998 Venus HW video encode and decode. >> (Based on qcom,msm8996-venus.yaml) >> >> Signed-off-by: Marc Gonzalez <mgonzalez@freebox.fr> >> --- [...] >> + >> + required: >> + - compatible >> + - clocks >> + - clock-names >> + - power-domains >> + >> + additionalProperties: false > > In nested blocks, put it after the type:object, for readability. > >> + > > > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> https://lore.kernel.org/linux-arm-msm/ba40de82-b308-67b1-5751-bb2d95f2b8a5@linaro.org/ We've since established that the video-encoder/decoder subnodes are bogus Konrad
On 30/04/2024 01:19, Bryan O'Donoghue wrote: > On 29/04/2024 17:19, Marc Gonzalez wrote: > >> From: Pierre-Hugues Husson <phhusson@freebox.fr> >> >> Add the missing bits for MSM8998 support. >> >> Signed-off-by: Pierre-Hugues Husson <phhusson@freebox.fr> >> Signed-off-by: Marc Gonzalez <mgonzalez@freebox.fr> >> --- >> drivers/media/platform/qcom/venus/core.c | 42 ++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 42 insertions(+) >> >> diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c >> index ce206b7097541..42e0c580e093d 100644 >> --- a/drivers/media/platform/qcom/venus/core.c >> +++ b/drivers/media/platform/qcom/venus/core.c >> @@ -587,6 +587,47 @@ static const struct venus_resources msm8996_res = { >> .fwname = "qcom/venus-4.2/venus.mbn", >> }; >> >> +static const struct freq_tbl msm8998_freq_table[] = { >> + { 1944000, 520000000 }, /* 4k UHD @ 60 (decode only) */ >> + { 972000, 520000000 }, /* 4k UHD @ 30 */ >> + { 489600, 346666667 }, /* 1080p @ 60 */ >> + { 244800, 150000000 }, /* 1080p @ 30 */ >> + { 108000, 75000000 }, /* 720p @ 30 */ >> +}; >> + >> +/* >> + * https://git.codelinaro.org/clo/la/kernel/msm-4.4/-/blob/caf_migration/kernel.lnx.4.4.r38-rel/arch/arm/boot/dts/qcom/msm8998-vidc.dtsi > > Nice touch. > > Does encoding/decoding work on -next sans interconnect support ? I think > we discussed on IRC it does but I'll ask again just to confirm. (We have no use-case for encoding.) Decoding works, of course. I would not submit a broken feature :) (vp9 2560x1440 59.940fps) decodes at x2 (122s for 240s) (vp9 854x480 29.970fps) decodes at x15 ( 16s for 240s) I find the performance quite decent. Though I would have expected a larger performance ratio: 2560x1440 59.940fps = 221 Mpixel/s 854x480 29.970fps = 12 Mpixel/s If 1440p decodes at x2, 480p should decode at x30 ? Or maybe the bottleneck is elsewhere :) Regards
Superseded by Message-ID: <ff646f97-68e3-4fef-9b56-2bd98f0cbe7d@freebox.fr> Subject: [PATCH v2 0/3] Add support for qcom msm8998-venus (HW vdec / venc) Date: Tue, 30 Apr 2024 17:28:46 +0200 On 29/04/2024 18:14, Marc Gonzalez wrote: > Nothing to declare. > > Marc Gonzalez (3): > dt-bindings: media: add qcom,msm8998-venus > arm64: dts: qcom: msm8998: add venus node > media: venus: add MSM8998 support > > Documentation/devicetree/bindings/media/qcom,msm8998-venus.yaml | 155 ++++++++++++++++++++++++++++ > arch/arm64/boot/dts/qcom/msm8998.dtsi | 48 +++++++++ > drivers/media/platform/qcom/venus/core.c | 42 ++++++++ > 3 files changed, 245 insertions(+) > create mode 100644 Documentation/devicetree/bindings/media/qcom,msm8998-venus.yaml