diff mbox series

media: venus: Fix firmware path for sm8250

Message ID 20230711185330.10106-1-patrick.whewell@sightlineapplications.com (mailing list archive)
State New, archived
Headers show
Series media: venus: Fix firmware path for sm8250 | expand

Commit Message

Patrick Whewell July 11, 2023, 6:53 p.m. UTC
The firmware path for the sm8250 resources is incorrect. This fixes the
path to address the firmware correctly.

Signed-off-by: Patrick Whewell <patrick.whewell@sightlineapplications.com>
---
 drivers/media/platform/qcom/venus/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Bryan O'Donoghue July 12, 2023, 9:50 a.m. UTC | #1
On 11/07/2023 19:53, Patrick Whewell wrote:
> The firmware path for the sm8250 resources is incorrect. This fixes the
> path to address the firmware correctly.
> 
> Signed-off-by: Patrick Whewell <patrick.whewell@sightlineapplications.com>
> ---
>   drivers/media/platform/qcom/venus/core.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
> index 2ae867cb4c48..348085f8fc9c 100644
> --- a/drivers/media/platform/qcom/venus/core.c
> +++ b/drivers/media/platform/qcom/venus/core.c
> @@ -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[] = {

Is the policy not to stick with .mdt for existing platforms but use .mbn 
for new platforms.

https://lore.kernel.org/all/CALAqxLU1gjTY95+phBt=WksyguZuKpNKa6aYaJTe0GeCAg6WrA@mail.gmail.com/T/

Its a symlink for me but, is it a symlink for everybody ?

root@linaro-gnome:~# ls /lib/firmware/qcom/vpu-1.0/ -l
lrwxrwxrwx 1 root root       9 Dec  2  2022 venus.mdt -> venus.mbn

---
bod
Dmitry Baryshkov July 19, 2023, 1:03 p.m. UTC | #2
On 12/07/2023 12:50, Bryan O'Donoghue wrote:
> On 11/07/2023 19:53, Patrick Whewell wrote:
>> The firmware path for the sm8250 resources is incorrect. This fixes the
>> path to address the firmware correctly.
>>
>> Signed-off-by: Patrick Whewell 
>> <patrick.whewell@sightlineapplications.com>
>> ---
>>   drivers/media/platform/qcom/venus/core.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/media/platform/qcom/venus/core.c 
>> b/drivers/media/platform/qcom/venus/core.c
>> index 2ae867cb4c48..348085f8fc9c 100644
>> --- a/drivers/media/platform/qcom/venus/core.c
>> +++ b/drivers/media/platform/qcom/venus/core.c
>> @@ -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[] = {
> 
> Is the policy not to stick with .mdt for existing platforms but use .mbn 
> for new platforms.

This was slightly different for venus, where it was suggested to use 
.mdt for all the platforms. However last year when Chrome team was 
updating sc7280/sc7180 Venus firmware, Rob Clark and yours truly have 
persuaded them to (finally) switch to .mbn and provide compatibility 
.mdt symlinks.

Then we have similarly converted all the rest of the venus firmware files.

See:

https://lore.kernel.org/linux-arm-msm/CANHAJhG-aoOBgTzirGu-1uqCFUJd+AnenMSkoUqnG3mhraCRfw@mail.gmail.com/t/#u

https://lore.kernel.org/linux-arm-msm/CANHAJhEWXf8U-FJJbOUpRV1gCXsd++H8kzbiBP1Z7iryaOCoYQ@mail.gmail.com/t/#u

> 
> https://lore.kernel.org/all/CALAqxLU1gjTY95+phBt=WksyguZuKpNKa6aYaJTe0GeCAg6WrA@mail.gmail.com/T/
> 
> Its a symlink for me but, is it a symlink for everybody ?
> 
> root@linaro-gnome:~# ls /lib/firmware/qcom/vpu-1.0/ -l
> lrwxrwxrwx 1 root root       9 Dec  2  2022 venus.mdt -> venus.mbn

Yes, it is a symlink for everybody:

$ grep Link.*qcom.v linux-firmware/WHENCE
Link: qcom/venus-1.8/venus.mdt -> venus.mbn
Link: qcom/venus-4.2/venus.mdt -> venus.mbn
Link: qcom/venus-5.2/venus.mdt -> venus.mbn
Link: qcom/venus-5.4/venus.mdt -> venus.mbn
Link: qcom/vpu-1.0/venus.mdt -> venus.mbn

So, long story short, I think this patch makes sense (and we should 
update other entries in this file too).

Patrick, maybe you can do it as well?
Bryan O'Donoghue July 19, 2023, 1:04 p.m. UTC | #3
On 19/07/2023 14:03, Dmitry Baryshkov wrote:
> On 12/07/2023 12:50, Bryan O'Donoghue wrote:
>> On 11/07/2023 19:53, Patrick Whewell wrote:
>>> The firmware path for the sm8250 resources is incorrect. This fixes the
>>> path to address the firmware correctly.
>>>
>>> Signed-off-by: Patrick Whewell 
>>> <patrick.whewell@sightlineapplications.com>
>>> ---
>>>   drivers/media/platform/qcom/venus/core.c | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/media/platform/qcom/venus/core.c 
>>> b/drivers/media/platform/qcom/venus/core.c
>>> index 2ae867cb4c48..348085f8fc9c 100644
>>> --- a/drivers/media/platform/qcom/venus/core.c
>>> +++ b/drivers/media/platform/qcom/venus/core.c
>>> @@ -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[] = {
>>
>> Is the policy not to stick with .mdt for existing platforms but use 
>> .mbn for new platforms.
> 
> This was slightly different for venus, where it was suggested to use 
> .mdt for all the platforms. However last year when Chrome team was 
> updating sc7280/sc7180 Venus firmware, Rob Clark and yours truly have 
> persuaded them to (finally) switch to .mbn and provide compatibility 
> .mdt symlinks.
> 
> Then we have similarly converted all the rest of the venus firmware files.
> 
> See:
> 
> https://lore.kernel.org/linux-arm-msm/CANHAJhG-aoOBgTzirGu-1uqCFUJd+AnenMSkoUqnG3mhraCRfw@mail.gmail.com/t/#u
> 
> https://lore.kernel.org/linux-arm-msm/CANHAJhEWXf8U-FJJbOUpRV1gCXsd++H8kzbiBP1Z7iryaOCoYQ@mail.gmail.com/t/#u
> 
>>
>> https://lore.kernel.org/all/CALAqxLU1gjTY95+phBt=WksyguZuKpNKa6aYaJTe0GeCAg6WrA@mail.gmail.com/T/
>>
>> Its a symlink for me but, is it a symlink for everybody ?
>>
>> root@linaro-gnome:~# ls /lib/firmware/qcom/vpu-1.0/ -l
>> lrwxrwxrwx 1 root root       9 Dec  2  2022 venus.mdt -> venus.mbn
> 
> Yes, it is a symlink for everybody:
> 
> $ grep Link.*qcom.v linux-firmware/WHENCE
> Link: qcom/venus-1.8/venus.mdt -> venus.mbn
> Link: qcom/venus-4.2/venus.mdt -> venus.mbn
> Link: qcom/venus-5.2/venus.mdt -> venus.mbn
> Link: qcom/venus-5.4/venus.mdt -> venus.mbn
> Link: qcom/vpu-1.0/venus.mdt -> venus.mbn
> 
> So, long story short, I think this patch makes sense (and we should 
> update other entries in this file too).
> 
> Patrick, maybe you can do it as well?
> 

Fine so.

Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
diff mbox series

Patch

diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 2ae867cb4c48..348085f8fc9c 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -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[] = {