Re: [PATCH] drm/msm/a6xx: add missing MODULE_FIRMWARE()

Bjorn Andersson
2019-07-08T18:18:50Z

On Wed 03 Jul 07:00 PDT 2019, Rob Clark wrote:

> From: Rob Clark <robdclark@chromium.org>
>
> For platforms that require the "zap shader" to take the GPU out of
> secure mode at boot, we also need the zap fw to end up in the initrd.
>
> Signed-off-by: Rob Clark <robdclark@chromium.org>

My upcoming pull request for this merge window includes the support for
the mdt_loader to read unsplit firmware files. So how about running the
firmware through [1] (pil-squasher a630_zap.mbn a630_zap.mdt) and
pointing the driver to use the single .mbn file instead?

If not, you have my:
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

[1] https://github.com/andersson/pil-squasher

Regards,
Bjorn

> ---
> drivers/gpu/drm/msm/adreno/adreno_device.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
> index d9ac8c4cd866..aa64514afd5c 100644
> --- a/drivers/gpu/drm/msm/adreno/adreno_device.c
> +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
> @@ -174,6 +174,10 @@ MODULE_FIRMWARE("qcom/a530_zap.b01");
> MODULE_FIRMWARE("qcom/a530_zap.b02");
> MODULE_FIRMWARE("qcom/a630_sqe.fw");
> MODULE_FIRMWARE("qcom/a630_gmu.bin");
> +MODULE_FIRMWARE("qcom/a630_zap.mdt");
> +MODULE_FIRMWARE("qcom/a630_zap.b00");
> +MODULE_FIRMWARE("qcom/a630_zap.b01");
> +MODULE_FIRMWARE("qcom/a630_zap.b02");
>
> static inline bool _rev_match(uint8_t entry, uint8_t id)
> {
> --
> 2.20.1
>