* [PATCH] drm/msm/adreno: Update MODULE_FIRMWARE macros
@ 2023-06-16 12:28 Juerg Haefliger
2023-06-16 15:23 ` Brian Masney
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Juerg Haefliger @ 2023-06-16 12:28 UTC (permalink / raw)
To: robdclark, quic_abhinavk, dmitry.baryshkov, sean, airlied, daniel,
linux-arm-msm, dri-devel, freedreno
Cc: linux-kernel, johan+linaro, konrad.dybcio, quic_akhilpo, ribalda,
joel, juerg.haefliger
Add missing MODULE_FIRMWARE macros and remove some for firmwares that
the driver no longer references.
Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
---
drivers/gpu/drm/msm/adreno/adreno_device.c | 23 ++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
index 8cff86e9d35c..9f70d7c1a72a 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_device.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
@@ -364,17 +364,32 @@ 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/a506_zap.mdt");
+MODULE_FIRMWARE("qcom/a508_zap.mdt");
+MODULE_FIRMWARE("qcom/a512_zap.mdt");
MODULE_FIRMWARE("qcom/a530_pm4.fw");
MODULE_FIRMWARE("qcom/a530_pfp.fw");
MODULE_FIRMWARE("qcom/a530v3_gpmu.fw2");
MODULE_FIRMWARE("qcom/a530_zap.mdt");
-MODULE_FIRMWARE("qcom/a530_zap.b00");
-MODULE_FIRMWARE("qcom/a530_zap.b01");
-MODULE_FIRMWARE("qcom/a530_zap.b02");
+MODULE_FIRMWARE("qcom/a540_gpmu.fw2");
+MODULE_FIRMWARE("qcom/a540_zap.mdt");
+MODULE_FIRMWARE("qcom/a615_zap.mdt");
MODULE_FIRMWARE("qcom/a619_gmu.bin");
MODULE_FIRMWARE("qcom/a630_sqe.fw");
MODULE_FIRMWARE("qcom/a630_gmu.bin");
-MODULE_FIRMWARE("qcom/a630_zap.mbn");
+MODULE_FIRMWARE("qcom/a630_zap.mdt");
+MODULE_FIRMWARE("qcom/a640_gmu.bin");
+MODULE_FIRMWARE("qcom/a640_zap.mdt");
+MODULE_FIRMWARE("qcom/a650_gmu.bin");
+MODULE_FIRMWARE("qcom/a650_sqe.fw");
+MODULE_FIRMWARE("qcom/a650_zap.mdt");
+MODULE_FIRMWARE("qcom/a660_gmu.bin");
+MODULE_FIRMWARE("qcom/a660_sqe.fw");
+MODULE_FIRMWARE("qcom/a660_zap.mdt");
+MODULE_FIRMWARE("qcom/leia_pfp_470.fw");
+MODULE_FIRMWARE("qcom/leia_pm4_470.fw");
+MODULE_FIRMWARE("qcom/yamato_pfp.fw");
+MODULE_FIRMWARE("qcom/yamato_pm4.fw");
static inline bool _rev_match(uint8_t entry, uint8_t id)
{
--
2.37.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/msm/adreno: Update MODULE_FIRMWARE macros
2023-06-16 12:28 [PATCH] drm/msm/adreno: Update MODULE_FIRMWARE macros Juerg Haefliger
@ 2023-06-16 15:23 ` Brian Masney
2023-06-16 15:55 ` Akhil P Oommen
2023-06-20 5:40 ` [PATCH v2] drm/msm/adreno: Add missing " Juerg Haefliger
2 siblings, 0 replies; 9+ messages in thread
From: Brian Masney @ 2023-06-16 15:23 UTC (permalink / raw)
To: Juerg Haefliger
Cc: robdclark, quic_abhinavk, dmitry.baryshkov, sean, airlied, daniel,
linux-arm-msm, dri-devel, freedreno, linux-kernel, johan+linaro,
konrad.dybcio, quic_akhilpo, ribalda, joel
Hi Juerg,
On Fri, Jun 16, 2023 at 02:28:15PM +0200, Juerg Haefliger wrote:
> Add missing MODULE_FIRMWARE macros and remove some for firmwares that
> the driver no longer references.
>
> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
> ---
> drivers/gpu/drm/msm/adreno/adreno_device.c | 23 ++++++++++++++++++----
> 1 file changed, 19 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
> index 8cff86e9d35c..9f70d7c1a72a 100644
> --- a/drivers/gpu/drm/msm/adreno/adreno_device.c
> +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
> @@ -364,17 +364,32 @@ 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/a506_zap.mdt");
> +MODULE_FIRMWARE("qcom/a508_zap.mdt");
> +MODULE_FIRMWARE("qcom/a512_zap.mdt");
> MODULE_FIRMWARE("qcom/a530_pm4.fw");
> MODULE_FIRMWARE("qcom/a530_pfp.fw");
> MODULE_FIRMWARE("qcom/a530v3_gpmu.fw2");
> MODULE_FIRMWARE("qcom/a530_zap.mdt");
> -MODULE_FIRMWARE("qcom/a530_zap.b00");
> -MODULE_FIRMWARE("qcom/a530_zap.b01");
> -MODULE_FIRMWARE("qcom/a530_zap.b02");
> +MODULE_FIRMWARE("qcom/a540_gpmu.fw2");
> +MODULE_FIRMWARE("qcom/a540_zap.mdt");
> +MODULE_FIRMWARE("qcom/a615_zap.mdt");
> MODULE_FIRMWARE("qcom/a619_gmu.bin");
> MODULE_FIRMWARE("qcom/a630_sqe.fw");
> MODULE_FIRMWARE("qcom/a630_gmu.bin");
> -MODULE_FIRMWARE("qcom/a630_zap.mbn");
> +MODULE_FIRMWARE("qcom/a630_zap.mdt");
> +MODULE_FIRMWARE("qcom/a640_gmu.bin");
> +MODULE_FIRMWARE("qcom/a640_zap.mdt");
> +MODULE_FIRMWARE("qcom/a650_gmu.bin");
> +MODULE_FIRMWARE("qcom/a650_sqe.fw");
> +MODULE_FIRMWARE("qcom/a650_zap.mdt");
> +MODULE_FIRMWARE("qcom/a660_gmu.bin");
> +MODULE_FIRMWARE("qcom/a660_sqe.fw");
> +MODULE_FIRMWARE("qcom/a660_zap.mdt");
> +MODULE_FIRMWARE("qcom/leia_pfp_470.fw");
> +MODULE_FIRMWARE("qcom/leia_pm4_470.fw");
> +MODULE_FIRMWARE("qcom/yamato_pfp.fw");
> +MODULE_FIRMWARE("qcom/yamato_pm4.fw");
You should rebase this on top of the latest -next since the a690 needs
to be added as well.
Brian
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/msm/adreno: Update MODULE_FIRMWARE macros
2023-06-16 12:28 [PATCH] drm/msm/adreno: Update MODULE_FIRMWARE macros Juerg Haefliger
2023-06-16 15:23 ` Brian Masney
@ 2023-06-16 15:55 ` Akhil P Oommen
2023-06-17 0:43 ` Dmitry Baryshkov
2023-06-20 5:08 ` Juerg Haefliger
2023-06-20 5:40 ` [PATCH v2] drm/msm/adreno: Add missing " Juerg Haefliger
2 siblings, 2 replies; 9+ messages in thread
From: Akhil P Oommen @ 2023-06-16 15:55 UTC (permalink / raw)
To: Juerg Haefliger
Cc: robdclark, quic_abhinavk, dmitry.baryshkov, sean, airlied, daniel,
linux-arm-msm, dri-devel, freedreno, linux-kernel, johan+linaro,
konrad.dybcio, ribalda, joel
On Fri, Jun 16, 2023 at 02:28:15PM +0200, Juerg Haefliger wrote:
>
> Add missing MODULE_FIRMWARE macros and remove some for firmwares that
> the driver no longer references.
>
> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
> ---
> drivers/gpu/drm/msm/adreno/adreno_device.c | 23 ++++++++++++++++++----
> 1 file changed, 19 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
> index 8cff86e9d35c..9f70d7c1a72a 100644
> --- a/drivers/gpu/drm/msm/adreno/adreno_device.c
> +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
> @@ -364,17 +364,32 @@ 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/a506_zap.mdt");
> +MODULE_FIRMWARE("qcom/a508_zap.mdt");
> +MODULE_FIRMWARE("qcom/a512_zap.mdt");
> MODULE_FIRMWARE("qcom/a530_pm4.fw");
> MODULE_FIRMWARE("qcom/a530_pfp.fw");
> MODULE_FIRMWARE("qcom/a530v3_gpmu.fw2");
> MODULE_FIRMWARE("qcom/a530_zap.mdt");
> -MODULE_FIRMWARE("qcom/a530_zap.b00");
> -MODULE_FIRMWARE("qcom/a530_zap.b01");
> -MODULE_FIRMWARE("qcom/a530_zap.b02");
Why are these not required when "qcom/a530_zap.mdt" is present?
mdt & b0* binaries are different partitions of the same secure
firmware. Even though we specify only the .mdt file here, the PIL driver
will load the *.b0* file automatically. OTOH, "*.mbn" is a standalone
unified binary format.
If the requirement is to ensure that all necessary firmwares are part of
your distribution, you should include the *.b0* files too here.
-Akhil
> +MODULE_FIRMWARE("qcom/a540_gpmu.fw2");
> +MODULE_FIRMWARE("qcom/a540_zap.mdt");
> +MODULE_FIRMWARE("qcom/a615_zap.mdt");
> MODULE_FIRMWARE("qcom/a619_gmu.bin");
> MODULE_FIRMWARE("qcom/a630_sqe.fw");
> MODULE_FIRMWARE("qcom/a630_gmu.bin");
> -MODULE_FIRMWARE("qcom/a630_zap.mbn");
> +MODULE_FIRMWARE("qcom/a630_zap.mdt");
> +MODULE_FIRMWARE("qcom/a640_gmu.bin");
> +MODULE_FIRMWARE("qcom/a640_zap.mdt");
> +MODULE_FIRMWARE("qcom/a650_gmu.bin");
> +MODULE_FIRMWARE("qcom/a650_sqe.fw");
> +MODULE_FIRMWARE("qcom/a650_zap.mdt");
> +MODULE_FIRMWARE("qcom/a660_gmu.bin");
> +MODULE_FIRMWARE("qcom/a660_sqe.fw");
> +MODULE_FIRMWARE("qcom/a660_zap.mdt");
> +MODULE_FIRMWARE("qcom/leia_pfp_470.fw");
> +MODULE_FIRMWARE("qcom/leia_pm4_470.fw");
> +MODULE_FIRMWARE("qcom/yamato_pfp.fw");
> +MODULE_FIRMWARE("qcom/yamato_pm4.fw");
>
> static inline bool _rev_match(uint8_t entry, uint8_t id)
> {
> --
> 2.37.2
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/msm/adreno: Update MODULE_FIRMWARE macros
2023-06-16 15:55 ` Akhil P Oommen
@ 2023-06-17 0:43 ` Dmitry Baryshkov
2023-06-20 5:08 ` Juerg Haefliger
1 sibling, 0 replies; 9+ messages in thread
From: Dmitry Baryshkov @ 2023-06-17 0:43 UTC (permalink / raw)
To: Akhil P Oommen, Juerg Haefliger
Cc: robdclark, quic_abhinavk, sean, airlied, daniel, linux-arm-msm,
dri-devel, freedreno, linux-kernel, johan+linaro, konrad.dybcio,
ribalda, joel
On 16/06/2023 18:55, Akhil P Oommen wrote:
> On Fri, Jun 16, 2023 at 02:28:15PM +0200, Juerg Haefliger wrote:
>>
>> Add missing MODULE_FIRMWARE macros and remove some for firmwares that
>> the driver no longer references.
>>
>> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
>> ---
>> drivers/gpu/drm/msm/adreno/adreno_device.c | 23 ++++++++++++++++++----
>> 1 file changed, 19 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
>> index 8cff86e9d35c..9f70d7c1a72a 100644
>> --- a/drivers/gpu/drm/msm/adreno/adreno_device.c
>> +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
>> @@ -364,17 +364,32 @@ 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/a506_zap.mdt");
>> +MODULE_FIRMWARE("qcom/a508_zap.mdt");
>> +MODULE_FIRMWARE("qcom/a512_zap.mdt");
>> MODULE_FIRMWARE("qcom/a530_pm4.fw");
>> MODULE_FIRMWARE("qcom/a530_pfp.fw");
>> MODULE_FIRMWARE("qcom/a530v3_gpmu.fw2");
>> MODULE_FIRMWARE("qcom/a530_zap.mdt");
>> -MODULE_FIRMWARE("qcom/a530_zap.b00");
>> -MODULE_FIRMWARE("qcom/a530_zap.b01");
>> -MODULE_FIRMWARE("qcom/a530_zap.b02");
> Why are these not required when "qcom/a530_zap.mdt" is present?
>
> mdt & b0* binaries are different partitions of the same secure
> firmware. Even though we specify only the .mdt file here, the PIL driver
> will load the *.b0* file automatically. OTOH, "*.mbn" is a standalone
> unified binary format.
>
> If the requirement is to ensure that all necessary firmwares are part of
> your distribution, you should include the *.b0* files too here.
I'd say, we should drop all zap files from this list. Linux-firmware
does not provide files with such names. The zap file name depends on the
SoC and the platform name.
Juerg, could you please split the patch into two parts:
- pfp/pm4/sqe firmware names (which can be merged pretty quickly, as
there is no controversy) and zap files changes (after we finish
discussion in this thread).
>
> -Akhil
>
>> +MODULE_FIRMWARE("qcom/a540_gpmu.fw2");
>> +MODULE_FIRMWARE("qcom/a540_zap.mdt");
>> +MODULE_FIRMWARE("qcom/a615_zap.mdt");
>> MODULE_FIRMWARE("qcom/a619_gmu.bin");
>> MODULE_FIRMWARE("qcom/a630_sqe.fw");
>> MODULE_FIRMWARE("qcom/a630_gmu.bin");
>> -MODULE_FIRMWARE("qcom/a630_zap.mbn");
>> +MODULE_FIRMWARE("qcom/a630_zap.mdt");
>> +MODULE_FIRMWARE("qcom/a640_gmu.bin");
>> +MODULE_FIRMWARE("qcom/a640_zap.mdt");
>> +MODULE_FIRMWARE("qcom/a650_gmu.bin");
>> +MODULE_FIRMWARE("qcom/a650_sqe.fw");
>> +MODULE_FIRMWARE("qcom/a650_zap.mdt");
>> +MODULE_FIRMWARE("qcom/a660_gmu.bin");
>> +MODULE_FIRMWARE("qcom/a660_sqe.fw");
>> +MODULE_FIRMWARE("qcom/a660_zap.mdt");
>> +MODULE_FIRMWARE("qcom/leia_pfp_470.fw");
>> +MODULE_FIRMWARE("qcom/leia_pm4_470.fw");
>> +MODULE_FIRMWARE("qcom/yamato_pfp.fw");
>> +MODULE_FIRMWARE("qcom/yamato_pm4.fw");
>>
>> static inline bool _rev_match(uint8_t entry, uint8_t id)
>> {
>> --
>> 2.37.2
>>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/msm/adreno: Update MODULE_FIRMWARE macros
2023-06-16 15:55 ` Akhil P Oommen
2023-06-17 0:43 ` Dmitry Baryshkov
@ 2023-06-20 5:08 ` Juerg Haefliger
1 sibling, 0 replies; 9+ messages in thread
From: Juerg Haefliger @ 2023-06-20 5:08 UTC (permalink / raw)
To: Akhil P Oommen
Cc: robdclark, quic_abhinavk, dmitry.baryshkov, sean, airlied, daniel,
linux-arm-msm, dri-devel, freedreno, linux-kernel, johan+linaro,
konrad.dybcio, ribalda, joel
[-- Attachment #1: Type: text/plain, Size: 3013 bytes --]
On Fri, 16 Jun 2023 21:25:01 +0530
Akhil P Oommen <quic_akhilpo@quicinc.com> wrote:
> On Fri, Jun 16, 2023 at 02:28:15PM +0200, Juerg Haefliger wrote:
> >
> > Add missing MODULE_FIRMWARE macros and remove some for firmwares that
> > the driver no longer references.
> >
> > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
> > ---
> > drivers/gpu/drm/msm/adreno/adreno_device.c | 23 ++++++++++++++++++----
> > 1 file changed, 19 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
> > index 8cff86e9d35c..9f70d7c1a72a 100644
> > --- a/drivers/gpu/drm/msm/adreno/adreno_device.c
> > +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
> > @@ -364,17 +364,32 @@ 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/a506_zap.mdt");
> > +MODULE_FIRMWARE("qcom/a508_zap.mdt");
> > +MODULE_FIRMWARE("qcom/a512_zap.mdt");
> > MODULE_FIRMWARE("qcom/a530_pm4.fw");
> > MODULE_FIRMWARE("qcom/a530_pfp.fw");
> > MODULE_FIRMWARE("qcom/a530v3_gpmu.fw2");
> > MODULE_FIRMWARE("qcom/a530_zap.mdt");
> > -MODULE_FIRMWARE("qcom/a530_zap.b00");
> > -MODULE_FIRMWARE("qcom/a530_zap.b01");
> > -MODULE_FIRMWARE("qcom/a530_zap.b02");
> Why are these not required when "qcom/a530_zap.mdt" is present?
>
> mdt & b0* binaries are different partitions of the same secure
> firmware. Even though we specify only the .mdt file here, the PIL driver
> will load the *.b0* file automatically. OTOH, "*.mbn" is a standalone
> unified binary format.
Ah thanks for the clarification.
> If the requirement is to ensure that all necessary firmwares are part of
> your distribution, you should include the *.b0* files too here.
I'll look into that. IMO, everything that the drivers can load should be
listed for completeness.
...Juerg
> -Akhil
>
> > +MODULE_FIRMWARE("qcom/a540_gpmu.fw2");
> > +MODULE_FIRMWARE("qcom/a540_zap.mdt");
> > +MODULE_FIRMWARE("qcom/a615_zap.mdt");
> > MODULE_FIRMWARE("qcom/a619_gmu.bin");
> > MODULE_FIRMWARE("qcom/a630_sqe.fw");
> > MODULE_FIRMWARE("qcom/a630_gmu.bin");
> > -MODULE_FIRMWARE("qcom/a630_zap.mbn");
> > +MODULE_FIRMWARE("qcom/a630_zap.mdt");
> > +MODULE_FIRMWARE("qcom/a640_gmu.bin");
> > +MODULE_FIRMWARE("qcom/a640_zap.mdt");
> > +MODULE_FIRMWARE("qcom/a650_gmu.bin");
> > +MODULE_FIRMWARE("qcom/a650_sqe.fw");
> > +MODULE_FIRMWARE("qcom/a650_zap.mdt");
> > +MODULE_FIRMWARE("qcom/a660_gmu.bin");
> > +MODULE_FIRMWARE("qcom/a660_sqe.fw");
> > +MODULE_FIRMWARE("qcom/a660_zap.mdt");
> > +MODULE_FIRMWARE("qcom/leia_pfp_470.fw");
> > +MODULE_FIRMWARE("qcom/leia_pm4_470.fw");
> > +MODULE_FIRMWARE("qcom/yamato_pfp.fw");
> > +MODULE_FIRMWARE("qcom/yamato_pm4.fw");
> >
> > static inline bool _rev_match(uint8_t entry, uint8_t id)
> > {
> > --
> > 2.37.2
> >
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] drm/msm/adreno: Add missing MODULE_FIRMWARE macros
2023-06-16 12:28 [PATCH] drm/msm/adreno: Update MODULE_FIRMWARE macros Juerg Haefliger
2023-06-16 15:23 ` Brian Masney
2023-06-16 15:55 ` Akhil P Oommen
@ 2023-06-20 5:40 ` Juerg Haefliger
2023-06-22 18:44 ` Dmitry Baryshkov
2 siblings, 1 reply; 9+ messages in thread
From: Juerg Haefliger @ 2023-06-20 5:40 UTC (permalink / raw)
To: juerg.haefliger
Cc: airlied, daniel, dmitry.baryshkov, dri-devel, freedreno, joel,
johan+linaro, konrad.dybcio, linux-arm-msm, linux-kernel,
quic_abhinavk, quic_akhilpo, ribalda, robdclark, sean
The driver references some firmware files that don't have corresponding
MODULE_FIRMWARE macros and thus won't be listed via modinfo. Fix that.
Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
---
v2:
- Drop addition and removal of zap files (needs more discussion)
- Add new a690_gmu.bin
- Update commit subject and message accordingly
---
drivers/gpu/drm/msm/adreno/adreno_device.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
index cb94cfd137a8..7c1f9a844009 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_device.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
@@ -397,10 +397,21 @@ MODULE_FIRMWARE("qcom/a530_zap.mdt");
MODULE_FIRMWARE("qcom/a530_zap.b00");
MODULE_FIRMWARE("qcom/a530_zap.b01");
MODULE_FIRMWARE("qcom/a530_zap.b02");
+MODULE_FIRMWARE("qcom/a540_gpmu.fw2");
MODULE_FIRMWARE("qcom/a619_gmu.bin");
MODULE_FIRMWARE("qcom/a630_sqe.fw");
MODULE_FIRMWARE("qcom/a630_gmu.bin");
MODULE_FIRMWARE("qcom/a630_zap.mbn");
+MODULE_FIRMWARE("qcom/a640_gmu.bin");
+MODULE_FIRMWARE("qcom/a650_gmu.bin");
+MODULE_FIRMWARE("qcom/a650_sqe.fw");
+MODULE_FIRMWARE("qcom/a660_gmu.bin");
+MODULE_FIRMWARE("qcom/a660_sqe.fw");
+MODULE_FIRMWARE("qcom/a690_gmu.bin");
+MODULE_FIRMWARE("qcom/leia_pfp_470.fw");
+MODULE_FIRMWARE("qcom/leia_pm4_470.fw");
+MODULE_FIRMWARE("qcom/yamato_pfp.fw");
+MODULE_FIRMWARE("qcom/yamato_pm4.fw");
static inline bool _rev_match(uint8_t entry, uint8_t id)
{
--
2.37.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2] drm/msm/adreno: Add missing MODULE_FIRMWARE macros
2023-06-20 5:40 ` [PATCH v2] drm/msm/adreno: Add missing " Juerg Haefliger
@ 2023-06-22 18:44 ` Dmitry Baryshkov
2023-08-15 11:52 ` Juerg Haefliger
0 siblings, 1 reply; 9+ messages in thread
From: Dmitry Baryshkov @ 2023-06-22 18:44 UTC (permalink / raw)
To: Juerg Haefliger
Cc: airlied, daniel, dri-devel, freedreno, joel, johan+linaro,
konrad.dybcio, linux-arm-msm, linux-kernel, quic_abhinavk,
quic_akhilpo, ribalda, robdclark, sean
On 20/06/2023 08:40, Juerg Haefliger wrote:
> The driver references some firmware files that don't have corresponding
> MODULE_FIRMWARE macros and thus won't be listed via modinfo. Fix that.
>
> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
>
> ---
> v2:
> - Drop addition and removal of zap files (needs more discussion)
> - Add new a690_gmu.bin
> - Update commit subject and message accordingly
> ---
> drivers/gpu/drm/msm/adreno/adreno_device.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] drm/msm/adreno: Add missing MODULE_FIRMWARE macros
2023-06-22 18:44 ` Dmitry Baryshkov
@ 2023-08-15 11:52 ` Juerg Haefliger
2023-08-15 14:48 ` Joel Fernandes
0 siblings, 1 reply; 9+ messages in thread
From: Juerg Haefliger @ 2023-08-15 11:52 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: airlied, daniel, dri-devel, freedreno, joel, johan+linaro,
konrad.dybcio, linux-arm-msm, linux-kernel, quic_abhinavk,
quic_akhilpo, ribalda, robdclark, sean
[-- Attachment #1: Type: text/plain, Size: 822 bytes --]
On Thu, 22 Jun 2023 21:44:25 +0300
Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote:
> On 20/06/2023 08:40, Juerg Haefliger wrote:
> > The driver references some firmware files that don't have corresponding
> > MODULE_FIRMWARE macros and thus won't be listed via modinfo. Fix that.
> >
> > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
> >
> > ---
> > v2:
> > - Drop addition and removal of zap files (needs more discussion)
> > - Add new a690_gmu.bin
> > - Update commit subject and message accordingly
> > ---
> > drivers/gpu/drm/msm/adreno/adreno_device.c | 11 +++++++++++
> > 1 file changed, 11 insertions(+)
>
> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>
It looks like this didn't go anywhere. Is there something missing?
...Juerg
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] drm/msm/adreno: Add missing MODULE_FIRMWARE macros
2023-08-15 11:52 ` Juerg Haefliger
@ 2023-08-15 14:48 ` Joel Fernandes
0 siblings, 0 replies; 9+ messages in thread
From: Joel Fernandes @ 2023-08-15 14:48 UTC (permalink / raw)
To: Juerg Haefliger
Cc: Dmitry Baryshkov, airlied, daniel, dri-devel, freedreno,
johan+linaro, konrad.dybcio, linux-arm-msm, linux-kernel,
quic_abhinavk, quic_akhilpo, ribalda, robdclark, sean
On Tue, Aug 15, 2023 at 7:52 AM Juerg Haefliger
<juerg.haefliger@canonical.com> wrote:
>
> On Thu, 22 Jun 2023 21:44:25 +0300
> Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote:
>
> > On 20/06/2023 08:40, Juerg Haefliger wrote:
> > > The driver references some firmware files that don't have corresponding
> > > MODULE_FIRMWARE macros and thus won't be listed via modinfo. Fix that.
> > >
> > > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
> > >
> > > ---
> > > v2:
> > > - Drop addition and removal of zap files (needs more discussion)
> > > - Add new a690_gmu.bin
> > > - Update commit subject and message accordingly
> > > ---
> > > drivers/gpu/drm/msm/adreno/adreno_device.c | 11 +++++++++++
> > > 1 file changed, 11 insertions(+)
> >
> > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> >
>
Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org>
thanks,
- Joel
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-08-15 14:49 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-16 12:28 [PATCH] drm/msm/adreno: Update MODULE_FIRMWARE macros Juerg Haefliger
2023-06-16 15:23 ` Brian Masney
2023-06-16 15:55 ` Akhil P Oommen
2023-06-17 0:43 ` Dmitry Baryshkov
2023-06-20 5:08 ` Juerg Haefliger
2023-06-20 5:40 ` [PATCH v2] drm/msm/adreno: Add missing " Juerg Haefliger
2023-06-22 18:44 ` Dmitry Baryshkov
2023-08-15 11:52 ` Juerg Haefliger
2023-08-15 14:48 ` Joel Fernandes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox