* [PATCH] drm/msm/a6xx: add missing MODULE_FIRMWARE()
@ 2019-07-03 14:00 Rob Clark
2019-07-08 15:24 ` Jordan Crouse
2019-07-08 18:18 ` Bjorn Andersson
0 siblings, 2 replies; 4+ messages in thread
From: Rob Clark @ 2019-07-03 14:00 UTC (permalink / raw)
To: dri-devel
Cc: Rob Clark, Rob Clark, Sean Paul, David Airlie, Daniel Vetter,
Jordan Crouse, linux-arm-msm, freedreno, linux-kernel
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>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/msm/a6xx: add missing MODULE_FIRMWARE()
2019-07-03 14:00 [PATCH] drm/msm/a6xx: add missing MODULE_FIRMWARE() Rob Clark
@ 2019-07-08 15:24 ` Jordan Crouse
2019-07-08 18:18 ` Bjorn Andersson
1 sibling, 0 replies; 4+ messages in thread
From: Jordan Crouse @ 2019-07-08 15:24 UTC (permalink / raw)
To: Rob Clark
Cc: dri-devel, Rob Clark, Sean Paul, David Airlie, Daniel Vetter,
linux-arm-msm, freedreno, linux-kernel
On Wed, Jul 03, 2019 at 07:00:35AM -0700, 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>
> ---
> 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");
Hopefully we are in the very last days of the split PIL so we can leave this
ugliness behind us once and for all.
Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org>
> static inline bool _rev_match(uint8_t entry, uint8_t id)
> {
> --
> 2.20.1
>
--
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/msm/a6xx: add missing MODULE_FIRMWARE()
2019-07-03 14:00 [PATCH] drm/msm/a6xx: add missing MODULE_FIRMWARE() Rob Clark
2019-07-08 15:24 ` Jordan Crouse
@ 2019-07-08 18:18 ` Bjorn Andersson
2019-07-10 16:05 ` Rob Clark
1 sibling, 1 reply; 4+ messages in thread
From: Bjorn Andersson @ 2019-07-08 18:18 UTC (permalink / raw)
To: Rob Clark
Cc: dri-devel, Rob Clark, Sean Paul, David Airlie, Daniel Vetter,
Jordan Crouse, linux-arm-msm, freedreno, linux-kernel
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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/msm/a6xx: add missing MODULE_FIRMWARE()
2019-07-08 18:18 ` Bjorn Andersson
@ 2019-07-10 16:05 ` Rob Clark
0 siblings, 0 replies; 4+ messages in thread
From: Rob Clark @ 2019-07-10 16:05 UTC (permalink / raw)
To: Bjorn Andersson
Cc: dri-devel, Rob Clark, Sean Paul, David Airlie, Daniel Vetter,
Jordan Crouse, linux-arm-msm, freedreno,
Linux Kernel Mailing List
On Mon, Jul 8, 2019 at 11:18 AM Bjorn Andersson
<bjorn.andersson@linaro.org> wrote:
>
> 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?
>
I wonder if it would just make sense to list both, at least until we
change the a6xx code to *require* zap fw if the zap node in dt isn't
removed (since the outcome of gpu driver assuming missing zap fw means
zap is not required is slightly brutal)
BR,
-R
>
> If not, you have my:
> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
>
> [1] https://github.com/andersson/pil-squasher
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-07-10 16:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-03 14:00 [PATCH] drm/msm/a6xx: add missing MODULE_FIRMWARE() Rob Clark
2019-07-08 15:24 ` Jordan Crouse
2019-07-08 18:18 ` Bjorn Andersson
2019-07-10 16:05 ` Rob Clark
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).