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@xxxxxxxxxxxxx> > --- > 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 >