Add a qcm2290 compatible binding to the venus core.
Video encoding support is not exposed until the relevant hardware
capabilities are enabled.
Co-developed-by: Loic Poulain <loic.poulain@oss.qualcomm.com>
Signed-off-by: Loic Poulain <loic.poulain@oss.qualcomm.com>
Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez@oss.qualcomm.com>
---
drivers/media/platform/qcom/venus/core.c | 39 ++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 736ef53d988d..f1f211ca1ce2 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -1062,6 +1062,44 @@ static const struct venus_resources sc7280_res = {
.enc_nodename = "video-encoder",
};
+static const struct freq_tbl qcm2290_freq_table[] = {
+ { 352800, 240000000 }, /* 1920x1088 @ 30 + 1280x720 @ 30 */
+ { 244800, 133000000 }, /* 1920x1088 @ 30 */
+};
+
+static const struct bw_tbl qcm2290_bw_table_dec[] = {
+ { 244800, 2128000, 0, 2128000, 0}, /* 1920x1088 @ 30 */
+};
+
+static const struct venus_resources qcm2290_res = {
+ .freq_tbl = qcm2290_freq_table,
+ .freq_tbl_size = ARRAY_SIZE(qcm2290_freq_table),
+ .bw_tbl_dec = qcm2290_bw_table_dec,
+ .bw_tbl_dec_size = ARRAY_SIZE(qcm2290_bw_table_dec),
+ .clks = { "core", "iface", "bus", "throttle" },
+ .clks_num = 4,
+ .vcodec0_clks = { "vcodec0_core", "vcodec0_bus" },
+ .vcodec_clks_num = 2,
+ .vcodec_pmdomains = (const char *[]) { "venus", "vcodec0" },
+ .vcodec_pmdomains_num = 2,
+ .opp_pmdomain = (const char *[]) { "cx" },
+ .vcodec_num = 1,
+ .hfi_version = HFI_VERSION_6XX_LITE,
+ .vpu_version = VPU_VERSION_AR50_LITE,
+ .max_load = 352800,
+ .num_vpp_pipes = 1,
+ .vmem_id = VIDC_RESOURCE_NONE,
+ .vmem_size = 0,
+ .vmem_addr = 0,
+ .cp_start = 0,
+ .cp_size = 0x70800000,
+ .cp_nonpixel_start = 0x1000000,
+ .cp_nonpixel_size = 0x24800000,
+ .dma_mask = 0xe0000000 - 1,
+ .fwname = "qcom/venus-6.0/venus.mbn",
+ .dec_nodename = "video-decoder",
+};
+
static const struct of_device_id venus_dt_match[] = {
{ .compatible = "qcom,msm8916-venus", .data = &msm8916_res, },
{ .compatible = "qcom,msm8996-venus", .data = &msm8996_res, },
@@ -1072,6 +1110,7 @@ static const struct of_device_id venus_dt_match[] = {
{ .compatible = "qcom,sc7180-venus", .data = &sc7180_res, },
{ .compatible = "qcom,sc7280-venus", .data = &sc7280_res, },
{ .compatible = "qcom,sm8250-venus", .data = &sm8250_res, },
+ { .compatible = "qcom,qcm2290-venus", .data = &qcm2290_res, },
{ }
};
MODULE_DEVICE_TABLE(of, venus_dt_match);
--
2.34.1
On 6/26/2025 7:29 PM, Jorge Ramirez-Ortiz wrote: > Add a qcm2290 compatible binding to the venus core. > > Video encoding support is not exposed until the relevant hardware > capabilities are enabled. > > Co-developed-by: Loic Poulain <loic.poulain@oss.qualcomm.com> > Signed-off-by: Loic Poulain <loic.poulain@oss.qualcomm.com> > Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez@oss.qualcomm.com> > --- > drivers/media/platform/qcom/venus/core.c | 39 ++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) > > diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c > index 736ef53d988d..f1f211ca1ce2 100644 > --- a/drivers/media/platform/qcom/venus/core.c > +++ b/drivers/media/platform/qcom/venus/core.c > @@ -1062,6 +1062,44 @@ static const struct venus_resources sc7280_res = { > .enc_nodename = "video-encoder", > }; > > +static const struct freq_tbl qcm2290_freq_table[] = { > + { 352800, 240000000 }, /* 1920x1088 @ 30 + 1280x720 @ 30 */ > + { 244800, 133000000 }, /* 1920x1088 @ 30 */ > +}; > + fix this corner. > +static const struct bw_tbl qcm2290_bw_table_dec[] = { > + { 244800, 2128000, 0, 2128000, 0}, /* 1920x1088 @ 30 */ > +}; > + what is the reference for this? > +static const struct venus_resources qcm2290_res = { > + .freq_tbl = qcm2290_freq_table, > + .freq_tbl_size = ARRAY_SIZE(qcm2290_freq_table), > + .bw_tbl_dec = qcm2290_bw_table_dec, > + .bw_tbl_dec_size = ARRAY_SIZE(qcm2290_bw_table_dec), > + .clks = { "core", "iface", "bus", "throttle" }, > + .clks_num = 4, > + .vcodec0_clks = { "vcodec0_core", "vcodec0_bus" }, > + .vcodec_clks_num = 2, > + .vcodec_pmdomains = (const char *[]) { "venus", "vcodec0" }, > + .vcodec_pmdomains_num = 2, > + .opp_pmdomain = (const char *[]) { "cx" }, > + .vcodec_num = 1, > + .hfi_version = HFI_VERSION_6XX_LITE, s/HFI_VERSION_6XX_LITE/HFI_VERSION_4XX_LITE Thanks, Dikshita > + .vpu_version = VPU_VERSION_AR50_LITE, > + .max_load = 352800, > + .num_vpp_pipes = 1, > + .vmem_id = VIDC_RESOURCE_NONE, > + .vmem_size = 0, > + .vmem_addr = 0, > + .cp_start = 0, > + .cp_size = 0x70800000, > + .cp_nonpixel_start = 0x1000000, > + .cp_nonpixel_size = 0x24800000, > + .dma_mask = 0xe0000000 - 1, > + .fwname = "qcom/venus-6.0/venus.mbn", > + .dec_nodename = "video-decoder", > +}; > + > static const struct of_device_id venus_dt_match[] = { > { .compatible = "qcom,msm8916-venus", .data = &msm8916_res, }, > { .compatible = "qcom,msm8996-venus", .data = &msm8996_res, }, > @@ -1072,6 +1110,7 @@ static const struct of_device_id venus_dt_match[] = { > { .compatible = "qcom,sc7180-venus", .data = &sc7180_res, }, > { .compatible = "qcom,sc7280-venus", .data = &sc7280_res, }, > { .compatible = "qcom,sm8250-venus", .data = &sm8250_res, }, > + { .compatible = "qcom,qcm2290-venus", .data = &qcm2290_res, }, > { } > }; > MODULE_DEVICE_TABLE(of, venus_dt_match);
On 27/06/25 18:46:10, Dikshita Agarwal wrote: > > > On 6/26/2025 7:29 PM, Jorge Ramirez-Ortiz wrote: > > Add a qcm2290 compatible binding to the venus core. > > > > Video encoding support is not exposed until the relevant hardware > > capabilities are enabled. > > > > Co-developed-by: Loic Poulain <loic.poulain@oss.qualcomm.com> > > Signed-off-by: Loic Poulain <loic.poulain@oss.qualcomm.com> > > Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez@oss.qualcomm.com> > > --- > > drivers/media/platform/qcom/venus/core.c | 39 ++++++++++++++++++++++++ > > 1 file changed, 39 insertions(+) > > > > diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c > > index 736ef53d988d..f1f211ca1ce2 100644 > > --- a/drivers/media/platform/qcom/venus/core.c > > +++ b/drivers/media/platform/qcom/venus/core.c > > @@ -1062,6 +1062,44 @@ static const struct venus_resources sc7280_res = { > > .enc_nodename = "video-encoder", > > }; > > > > +static const struct freq_tbl qcm2290_freq_table[] = { > > + { 352800, 240000000 }, /* 1920x1088 @ 30 + 1280x720 @ 30 */ > > + { 244800, 133000000 }, /* 1920x1088 @ 30 */ > > +}; > > + > fix this corner. ok, will wait for Vikash to confirm the other ones. > > +static const struct bw_tbl qcm2290_bw_table_dec[] = { > > + { 244800, 2128000, 0, 2128000, 0}, /* 1920x1088 @ 30 */ > > +}; > > + > what is the reference for this? > > +static const struct venus_resources qcm2290_res = { > > + .freq_tbl = qcm2290_freq_table, > > + .freq_tbl_size = ARRAY_SIZE(qcm2290_freq_table), > > + .bw_tbl_dec = qcm2290_bw_table_dec, > > + .bw_tbl_dec_size = ARRAY_SIZE(qcm2290_bw_table_dec), > > + .clks = { "core", "iface", "bus", "throttle" }, > > + .clks_num = 4, > > + .vcodec0_clks = { "vcodec0_core", "vcodec0_bus" }, > > + .vcodec_clks_num = 2, > > + .vcodec_pmdomains = (const char *[]) { "venus", "vcodec0" }, > > + .vcodec_pmdomains_num = 2, > > + .opp_pmdomain = (const char *[]) { "cx" }, > > + .vcodec_num = 1, > > + .hfi_version = HFI_VERSION_6XX_LITE, > s/HFI_VERSION_6XX_LITE/HFI_VERSION_4XX_LITE um right, going to rewrite this whole bit and get rid of 6XX_LITE/4XX_LITE (will post 4XX with a lite option instead, which is closer to the intended abstraction - even though the 6XX/4XX abstractions are kind of dubious...) > > Thanks, > Dikshita > > + .vpu_version = VPU_VERSION_AR50_LITE, > > + .max_load = 352800, > > + .num_vpp_pipes = 1, > > + .vmem_id = VIDC_RESOURCE_NONE, > > + .vmem_size = 0, > > + .vmem_addr = 0, > > + .cp_start = 0, > > + .cp_size = 0x70800000, > > + .cp_nonpixel_start = 0x1000000, > > + .cp_nonpixel_size = 0x24800000, > > + .dma_mask = 0xe0000000 - 1, > > + .fwname = "qcom/venus-6.0/venus.mbn", > > + .dec_nodename = "video-decoder", > > +}; > > + > > static const struct of_device_id venus_dt_match[] = { > > { .compatible = "qcom,msm8916-venus", .data = &msm8916_res, }, > > { .compatible = "qcom,msm8996-venus", .data = &msm8996_res, }, > > @@ -1072,6 +1110,7 @@ static const struct of_device_id venus_dt_match[] = { > > { .compatible = "qcom,sc7180-venus", .data = &sc7180_res, }, > > { .compatible = "qcom,sc7280-venus", .data = &sc7280_res, }, > > { .compatible = "qcom,sm8250-venus", .data = &sm8250_res, }, > > + { .compatible = "qcom,qcm2290-venus", .data = &qcm2290_res, }, > > { } > > }; > > MODULE_DEVICE_TABLE(of, venus_dt_match);
On 7/7/25 11:09 AM, Jorge Ramirez wrote: > On 27/06/25 18:46:10, Dikshita Agarwal wrote: >> >> >> On 6/26/2025 7:29 PM, Jorge Ramirez-Ortiz wrote: >>> Add a qcm2290 compatible binding to the venus core. >>> >>> Video encoding support is not exposed until the relevant hardware >>> capabilities are enabled. >>> >>> Co-developed-by: Loic Poulain <loic.poulain@oss.qualcomm.com> >>> Signed-off-by: Loic Poulain <loic.poulain@oss.qualcomm.com> >>> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez@oss.qualcomm.com> >>> --- >>> drivers/media/platform/qcom/venus/core.c | 39 ++++++++++++++++++++++++ >>> 1 file changed, 39 insertions(+) >>> >>> diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c >>> index 736ef53d988d..f1f211ca1ce2 100644 >>> --- a/drivers/media/platform/qcom/venus/core.c >>> +++ b/drivers/media/platform/qcom/venus/core.c >>> @@ -1062,6 +1062,44 @@ static const struct venus_resources sc7280_res = { >>> .enc_nodename = "video-encoder", >>> }; >>> >>> +static const struct freq_tbl qcm2290_freq_table[] = { >>> + { 352800, 240000000 }, /* 1920x1088 @ 30 + 1280x720 @ 30 */ >>> + { 244800, 133000000 }, /* 1920x1088 @ 30 */ >>> +}; >>> + >> fix this corner. > > ok, will wait for Vikash to confirm the other ones. Actually you can get rid of it now, I think: https://git.linuxtv.org/media.git/commit/?id=b179234b5e59013f8772da17b273f463f9720bdd Konrad
On 07/07/25 11:19:33, Konrad Dybcio wrote: > On 7/7/25 11:09 AM, Jorge Ramirez wrote: > > On 27/06/25 18:46:10, Dikshita Agarwal wrote: > >> > >> > >> On 6/26/2025 7:29 PM, Jorge Ramirez-Ortiz wrote: > >>> Add a qcm2290 compatible binding to the venus core. > >>> > >>> Video encoding support is not exposed until the relevant hardware > >>> capabilities are enabled. > >>> > >>> Co-developed-by: Loic Poulain <loic.poulain@oss.qualcomm.com> > >>> Signed-off-by: Loic Poulain <loic.poulain@oss.qualcomm.com> > >>> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez@oss.qualcomm.com> > >>> --- > >>> drivers/media/platform/qcom/venus/core.c | 39 ++++++++++++++++++++++++ > >>> 1 file changed, 39 insertions(+) > >>> > >>> diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c > >>> index 736ef53d988d..f1f211ca1ce2 100644 > >>> --- a/drivers/media/platform/qcom/venus/core.c > >>> +++ b/drivers/media/platform/qcom/venus/core.c > >>> @@ -1062,6 +1062,44 @@ static const struct venus_resources sc7280_res = { > >>> .enc_nodename = "video-encoder", > >>> }; > >>> > >>> +static const struct freq_tbl qcm2290_freq_table[] = { > >>> + { 352800, 240000000 }, /* 1920x1088 @ 30 + 1280x720 @ 30 */ > >>> + { 244800, 133000000 }, /* 1920x1088 @ 30 */ > >>> +}; > >>> + > >> fix this corner. > > > > ok, will wait for Vikash to confirm the other ones. > > Actually you can get rid of it now, I think: > > https://git.linuxtv.org/media.git/commit/?id=b179234b5e59013f8772da17b273f463f9720bdd > > Konrad yes, thanks!
On 26/06/2025 14:59, Jorge Ramirez-Ortiz wrote: > Add a qcm2290 compatible binding to the venus core. > > Video encoding support is not exposed until the relevant hardware > capabilities are enabled. > > Co-developed-by: Loic Poulain <loic.poulain@oss.qualcomm.com> > Signed-off-by: Loic Poulain <loic.poulain@oss.qualcomm.com> > Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez@oss.qualcomm.com> > --- > drivers/media/platform/qcom/venus/core.c | 39 ++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) > > diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c > index 736ef53d988d..f1f211ca1ce2 100644 > --- a/drivers/media/platform/qcom/venus/core.c > +++ b/drivers/media/platform/qcom/venus/core.c > @@ -1062,6 +1062,44 @@ static const struct venus_resources sc7280_res = { > .enc_nodename = "video-encoder", > }; > > +static const struct freq_tbl qcm2290_freq_table[] = { > + { 352800, 240000000 }, /* 1920x1088 @ 30 + 1280x720 @ 30 */ > + { 244800, 133000000 }, /* 1920x1088 @ 30 */ > +}; > + > +static const struct bw_tbl qcm2290_bw_table_dec[] = { > + { 244800, 2128000, 0, 2128000, 0}, /* 1920x1088 @ 30 */ > +}; > + > +static const struct venus_resources qcm2290_res = { > + .freq_tbl = qcm2290_freq_table, > + .freq_tbl_size = ARRAY_SIZE(qcm2290_freq_table), > + .bw_tbl_dec = qcm2290_bw_table_dec, > + .bw_tbl_dec_size = ARRAY_SIZE(qcm2290_bw_table_dec), > + .clks = { "core", "iface", "bus", "throttle" }, > + .clks_num = 4, > + .vcodec0_clks = { "vcodec0_core", "vcodec0_bus" }, > + .vcodec_clks_num = 2, > + .vcodec_pmdomains = (const char *[]) { "venus", "vcodec0" }, > + .vcodec_pmdomains_num = 2, > + .opp_pmdomain = (const char *[]) { "cx" }, > + .vcodec_num = 1, > + .hfi_version = HFI_VERSION_6XX_LITE, > + .vpu_version = VPU_VERSION_AR50_LITE, > + .max_load = 352800, > + .num_vpp_pipes = 1, > + .vmem_id = VIDC_RESOURCE_NONE, > + .vmem_size = 0, > + .vmem_addr = 0, > + .cp_start = 0, > + .cp_size = 0x70800000, > + .cp_nonpixel_start = 0x1000000, > + .cp_nonpixel_size = 0x24800000, > + .dma_mask = 0xe0000000 - 1, > + .fwname = "qcom/venus-6.0/venus.mbn", > + .dec_nodename = "video-decoder", > +}; > + > static const struct of_device_id venus_dt_match[] = { > { .compatible = "qcom,msm8916-venus", .data = &msm8916_res, }, > { .compatible = "qcom,msm8996-venus", .data = &msm8996_res, }, > @@ -1072,6 +1110,7 @@ static const struct of_device_id venus_dt_match[] = { > { .compatible = "qcom,sc7180-venus", .data = &sc7180_res, }, > { .compatible = "qcom,sc7280-venus", .data = &sc7280_res, }, > { .compatible = "qcom,sm8250-venus", .data = &sm8250_res, }, > + { .compatible = "qcom,qcm2290-venus", .data = &qcm2290_res, }, > { } > }; > MODULE_DEVICE_TABLE(of, venus_dt_match); Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
© 2016 - 2025 Red Hat, Inc.