Skip to content

Commit 354846c

Browse files
0xB0Dhverkuil
authored andcommitted
media: venus: Populate video encoder/decoder nodename entries
Populate encoder and decoder node-name entries for the upstream parts. Once done the compat="video-encoder" and compat="video-decoder" in the dtsi can be dropped though the venus driver will continue to favour DT declared video-encoder/video-decoder declarations over static declarations for compatibility. Tested-by: Renjiang Han <quic_renjiang@quicinc.com> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Signed-off-by: Stanimir Varbanov <stanimir.k.varbanov@gmail.com> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
1 parent 687bfbb commit 354846c

File tree

1 file changed

+10
-0
lines changed
  • drivers/media/platform/qcom/venus

1 file changed

+10
-0
lines changed

drivers/media/platform/qcom/venus/core.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,8 @@ static const struct venus_resources msm8916_res = {
671671
.vmem_addr = 0,
672672
.dma_mask = 0xddc00000 - 1,
673673
.fwname = "qcom/venus-1.8/venus.mbn",
674+
.dec_nodename = "video-decoder",
675+
.enc_nodename = "video-encoder",
674676
};
675677

676678
static const struct freq_tbl msm8996_freq_table[] = {
@@ -880,6 +882,8 @@ static const struct venus_resources sdm845_res_v2 = {
880882
.cp_nonpixel_start = 0x1000000,
881883
.cp_nonpixel_size = 0x24800000,
882884
.fwname = "qcom/venus-5.2/venus.mbn",
885+
.dec_nodename = "video-core0",
886+
.enc_nodename = "video-core1",
883887
};
884888

885889
static const struct freq_tbl sc7180_freq_table[] = {
@@ -928,6 +932,8 @@ static const struct venus_resources sc7180_res = {
928932
.cp_nonpixel_start = 0x1000000,
929933
.cp_nonpixel_size = 0x24800000,
930934
.fwname = "qcom/venus-5.4/venus.mbn",
935+
.dec_nodename = "video-decoder",
936+
.enc_nodename = "video-encoder",
931937
};
932938

933939
static const struct freq_tbl sm8250_freq_table[] = {
@@ -983,6 +989,8 @@ static const struct venus_resources sm8250_res = {
983989
.vmem_addr = 0,
984990
.dma_mask = 0xe0000000 - 1,
985991
.fwname = "qcom/vpu-1.0/venus.mbn",
992+
.dec_nodename = "video-decoder",
993+
.enc_nodename = "video-encoder",
986994
};
987995

988996
static const struct freq_tbl sc7280_freq_table[] = {
@@ -1045,6 +1053,8 @@ static const struct venus_resources sc7280_res = {
10451053
.cp_nonpixel_start = 0x1000000,
10461054
.cp_nonpixel_size = 0x24800000,
10471055
.fwname = "qcom/vpu-2.0/venus.mbn",
1056+
.dec_nodename = "video-decoder",
1057+
.enc_nodename = "video-encoder",
10481058
};
10491059

10501060
static const struct of_device_id venus_dt_match[] = {

0 commit comments

Comments
 (0)