Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Bryan O'Donoghue and committed by
Hans Verkuil
354846c3 687bfbba

+10
+10
drivers/media/platform/qcom/venus/core.c
··· 671 671 .vmem_addr = 0, 672 672 .dma_mask = 0xddc00000 - 1, 673 673 .fwname = "qcom/venus-1.8/venus.mbn", 674 + .dec_nodename = "video-decoder", 675 + .enc_nodename = "video-encoder", 674 676 }; 675 677 676 678 static const struct freq_tbl msm8996_freq_table[] = { ··· 882 880 .cp_nonpixel_start = 0x1000000, 883 881 .cp_nonpixel_size = 0x24800000, 884 882 .fwname = "qcom/venus-5.2/venus.mbn", 883 + .dec_nodename = "video-core0", 884 + .enc_nodename = "video-core1", 885 885 }; 886 886 887 887 static const struct freq_tbl sc7180_freq_table[] = { ··· 932 928 .cp_nonpixel_start = 0x1000000, 933 929 .cp_nonpixel_size = 0x24800000, 934 930 .fwname = "qcom/venus-5.4/venus.mbn", 931 + .dec_nodename = "video-decoder", 932 + .enc_nodename = "video-encoder", 935 933 }; 936 934 937 935 static const struct freq_tbl sm8250_freq_table[] = { ··· 989 983 .vmem_addr = 0, 990 984 .dma_mask = 0xe0000000 - 1, 991 985 .fwname = "qcom/vpu-1.0/venus.mbn", 986 + .dec_nodename = "video-decoder", 987 + .enc_nodename = "video-encoder", 992 988 }; 993 989 994 990 static const struct freq_tbl sc7280_freq_table[] = { ··· 1053 1045 .cp_nonpixel_start = 0x1000000, 1054 1046 .cp_nonpixel_size = 0x24800000, 1055 1047 .fwname = "qcom/vpu-2.0/venus.mbn", 1048 + .dec_nodename = "video-decoder", 1049 + .enc_nodename = "video-encoder", 1056 1050 }; 1057 1051 1058 1052 static const struct of_device_id venus_dt_match[] = {