drm/msm: update adreno firmware path in MODULE_FIRMWARE

Message ID 20171123103249.7827-1-nicolas.dechesne@linaro.org
State Accepted
Commit 73fc251f66bce75d652726a20a1f81877d32560a
Headers show
Series
  • drm/msm: update adreno firmware path in MODULE_FIRMWARE
Related show

Commit Message

Nicolas Dechesne Nov. 23, 2017, 10:32 a.m.
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@decadent.org.uk>
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>

---
 drivers/gpu/drm/msm/adreno/adreno_device.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

-- 
2.15.0

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Rob Clark Nov. 23, 2017, 2:54 p.m. | #1
On Thu, Nov 23, 2017 at 5:32 AM, Nicolas Dechesne
<nicolas.dechesne@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@decadent.org.uk>

> Signed-off-by: Nicolas Dechesne <nicolas.dechesne@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).

Also, I noticed we are missing a few a5xx fw files, but perhaps that
should be fixed with a separate patch.

Either way,

Reviewed-by: Rob Clark <robdclark@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

>

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Nicolas Dechesne Nov. 23, 2017, 3:09 p.m. | #2
On Thu, Nov 23, 2017 at 3:54 PM, Rob Clark <robdclark@gmail.com> wrote:
> On Thu, Nov 23, 2017 at 5:32 AM, Nicolas Dechesne

> <nicolas.dechesne@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@decadent.org.uk>

>> Signed-off-by: Nicolas Dechesne <nicolas.dechesne@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.

>

> Either way,

>

> Reviewed-by: Rob Clark <robdclark@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

>>

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ben Hutchings Nov. 23, 2017, 5:09 p.m. | #3
On Thu, 2017-11-23 at 16:09 +0100, Nicolas Dechesne wrote:
> On Thu, Nov 23, 2017 at 3:54 PM, Rob Clark <robdclark@gmail.com> wrote:

> > On Thu, Nov 23, 2017 at 5:32 AM, Nicolas Dechesne

> > <nicolas.dechesne@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@decadent.org.uk>

> > > Signed-off-by: Nicolas Dechesne <nicolas.dechesne@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.


Whenever I've added MODULE_FIRMWARE information I've listed only the
first-choice firmware paths.

initramfs-tools will warn when including a module if some of the listed
firmware is not available, so listing multiple paths for the same
firmware will likely mean it always warns about one of them.

Ben.

-- 
Ben Hutchings
When in doubt, use brute force. - Ken Thompson
Rob Clark Nov. 23, 2017, 5:43 p.m. | #4
On Thu, Nov 23, 2017 at 12:09 PM, Ben Hutchings <ben@decadent.org.uk> wrote:
> On Thu, 2017-11-23 at 16:09 +0100, Nicolas Dechesne wrote:

>> On Thu, Nov 23, 2017 at 3:54 PM, Rob Clark <robdclark@gmail.com> wrote:

>> > On Thu, Nov 23, 2017 at 5:32 AM, Nicolas Dechesne

>> > <nicolas.dechesne@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@decadent.org.uk>

>> > > Signed-off-by: Nicolas Dechesne <nicolas.dechesne@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.

>

> Whenever I've added MODULE_FIRMWARE information I've listed only the

> first-choice firmware paths.

>

> initramfs-tools will warn when including a module if some of the listed

> firmware is not available, so listing multiple paths for the same

> firmware will likely mean it always warns about one of them.

>


Ok, that sounds like good reason to not to list legacy paths.

BR,
-R
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rob Clark Nov. 23, 2017, 5:44 p.m. | #5
On Thu, Nov 23, 2017 at 10:09 AM, Nicolas Dechesne
<nicolas.dechesne@linaro.org> wrote:
> On Thu, Nov 23, 2017 at 3:54 PM, Rob Clark <robdclark@gmail.com> wrote:

>> On Thu, Nov 23, 2017 at 5:32 AM, Nicolas Dechesne

>> <nicolas.dechesne@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@decadent.org.uk>

>>> Signed-off-by: Nicolas Dechesne <nicolas.dechesne@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@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

>>>

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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)
 {