[PATCH] drm/msm: update adreno firmware path in MODULE_FIRMWARE

[Rob Clark]

On Thu, Nov 23, 2017 at 10:09 AM, Nicolas Dechesne
<nicolas.dechesne at linaro.org> wrote:
> On Thu, Nov 23, 2017 at 3:54 PM, Rob Clark <robdclark at gmail.com> wrote:
>> On Thu, Nov 23, 2017 at 5:32 AM, Nicolas Dechesne
>> <nicolas.dechesne at linaro.org> wrote:
>>> The preferred location for Adreno firmware files is now in qcom/ subfolder,
>>> especially now that we are adding some of them in linux-firmware.
>>>
>>> Reported-by: Ben Hutchings <ben at decadent.org.uk>
>>> Signed-off-by: Nicolas Dechesne <nicolas.dechesne at linaro.org>
>>
>> Thanks, I was wondering if we should perhaps list both old and new
>> paths?  I'm not sure, maybe we don't need to care about dracut or
>> initrd generation for the legacy case (since mostly there you are
>> using fastboot).
>
> I've been going back and forth on that too. and i decided to ignore
> the legacy paths... alternatively we could use the legacy paths for
> a3xx and the new path for a5xx since we have links for a3xx files...
> but i thought it was too much noise..
>
>>
>> Also, I noticed we are missing a few a5xx fw files, but perhaps that
>> should be fixed with a separate patch.
>
> as you want. I can include them if you prefer and resend.

I think based on what Ben pointed out, let's not include legacy paths.
But if you could send an additional patch to add the missing a5xx fw
that would be appreciated

BR,
-R


>>
>> Either way,
>>
>> Reviewed-by: Rob Clark <robdclark at gmail.com>
>>
>>> ---
>>>  drivers/gpu/drm/msm/adreno/adreno_device.c | 16 ++++++++--------
>>>  1 file changed, 8 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
>>> index 05022ea2a007..3c1d23b9ddc3 100644
>>> --- a/drivers/gpu/drm/msm/adreno/adreno_device.c
>>> +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
>>> @@ -90,14 +90,14 @@ static const struct adreno_info gpulist[] = {
>>>         },
>>>  };
>>>
>>> -MODULE_FIRMWARE("a300_pm4.fw");
>>> -MODULE_FIRMWARE("a300_pfp.fw");
>>> -MODULE_FIRMWARE("a330_pm4.fw");
>>> -MODULE_FIRMWARE("a330_pfp.fw");
>>> -MODULE_FIRMWARE("a420_pm4.fw");
>>> -MODULE_FIRMWARE("a420_pfp.fw");
>>> -MODULE_FIRMWARE("a530_fm4.fw");
>>> -MODULE_FIRMWARE("a530_pfp.fw");
>>> +MODULE_FIRMWARE("qcom/a300_pm4.fw");
>>> +MODULE_FIRMWARE("qcom/a300_pfp.fw");
>>> +MODULE_FIRMWARE("qcom/a330_pm4.fw");
>>> +MODULE_FIRMWARE("qcom/a330_pfp.fw");
>>> +MODULE_FIRMWARE("qcom/a420_pm4.fw");
>>> +MODULE_FIRMWARE("qcom/a420_pfp.fw");
>>> +MODULE_FIRMWARE("qcom/a530_fm4.fw");
>>> +MODULE_FIRMWARE("qcom/a530_pfp.fw");
>>>
>>>  static inline bool _rev_match(uint8_t entry, uint8_t id)
>>>  {
>>> --
>>> 2.15.0
>>>