On 7/20/2023 3:19 AM, Patrick Whewell wrote:
> The firmware path for some of the resources is still the old format. This
> fixes the path to address the firmware correctly using the new .mbn
> format.
>
> Signed-off-by: Patrick Whewell <patrick.whewell@xxxxxxxxxxxxxxxxxxxxxxxxx>
> ---
the changes look good to me.
Reviewed-by: Dikshita Agarwal <quic_dikshita@xxxxxxxxxxx>
> I've updated all .fwname to match the .mbn format. There is a
> qcom/venus-4.4/venus.mdt for the sdm660 that still remains but the linux-firmware
> package does not contain that firmware file anymore, so i left as is.
>
> drivers/media/platform/qcom/venus/core.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
> index 2ae867cb4c48..2d62669d99e1 100644
> --- a/drivers/media/platform/qcom/venus/core.c
> +++ b/drivers/media/platform/qcom/venus/core.c
> @@ -548,7 +548,7 @@ static const struct venus_resources msm8916_res = {
> .vmem_size = 0,
> .vmem_addr = 0,
> .dma_mask = 0xddc00000 - 1,
> - .fwname = "qcom/venus-1.8/venus.mdt",
> + .fwname = "qcom/venus-1.8/venus.mbn",
> };
>
> static const struct freq_tbl msm8996_freq_table[] = {
> @@ -581,7 +581,7 @@ static const struct venus_resources msm8996_res = {
> .vmem_size = 0,
> .vmem_addr = 0,
> .dma_mask = 0xddc00000 - 1,
> - .fwname = "qcom/venus-4.2/venus.mdt",
> + .fwname = "qcom/venus-4.2/venus.mbn",
> };
>
> static const struct freq_tbl sdm660_freq_table[] = {
> @@ -688,7 +688,7 @@ static const struct venus_resources sdm845_res = {
> .vmem_size = 0,
> .vmem_addr = 0,
> .dma_mask = 0xe0000000 - 1,
> - .fwname = "qcom/venus-5.2/venus.mdt",
> + .fwname = "qcom/venus-5.2/venus.mbn",
> };
>
> static const struct venus_resources sdm845_res_v2 = {
> @@ -717,7 +717,7 @@ static const struct venus_resources sdm845_res_v2 = {
> .cp_size = 0x70800000,
> .cp_nonpixel_start = 0x1000000,
> .cp_nonpixel_size = 0x24800000,
> - .fwname = "qcom/venus-5.2/venus.mdt",
> + .fwname = "qcom/venus-5.2/venus.mbn",
> };
>
> static const struct freq_tbl sc7180_freq_table[] = {
> @@ -760,7 +760,7 @@ static const struct venus_resources sc7180_res = {
> .vmem_size = 0,
> .vmem_addr = 0,
> .dma_mask = 0xe0000000 - 1,
> - .fwname = "qcom/venus-5.4/venus.mdt",
> + .fwname = "qcom/venus-5.4/venus.mbn",
> };
>
> static const struct freq_tbl sm8250_freq_table[] = {
> @@ -814,7 +814,7 @@ static const struct venus_resources sm8250_res = {
> .vmem_size = 0,
> .vmem_addr = 0,
> .dma_mask = 0xe0000000 - 1,
> - .fwname = "qcom/vpu-1.0/venus.mdt",
> + .fwname = "qcom/vpu-1.0/venus.mbn",
> };
>
> static const struct freq_tbl sc7280_freq_table[] = {
