[PATCH v2] nouveau: arm: Add MODULE_FIRMWARE for gk20a

[PATCH v2] nouveau: arm: Add MODULE_FIRMWARE for gk20a

[Nicolas Chauvet]

This patch is needed by initramfs tools to detect
the required firmware files for the module.

This patch tests for either TEGRA_124_SOC or TEGRA_132_SOC
for the firmwares related to the Tegra K1 generation.

v2: move the MODULE_FIRMWARE to the nvidia_platform.c file.
 This will avoid to test for NOUVEAU_PLATFORM_DRIVER

Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
---
 drivers/gpu/drm/nouveau/nouveau_platform.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/gpu/drm/nouveau/nouveau_platform.c b/drivers/gpu/drm/nouveau/nouveau_platform.c
index 3eb6654..9013141 100644
--- a/drivers/gpu/drm/nouveau/nouveau_platform.c
+++ b/drivers/gpu/drm/nouveau/nouveau_platform.c
@@ -65,3 +65,14 @@ struct platform_driver nouveau_platform_driver = {
 	.probe = nouveau_platform_probe,
 	.remove = nouveau_platform_remove,
 };
+
+#if IS_ENABLED(CONFIG_ARCH_TEGRA_124_SOC) || IS_ENABLED(CONFIG_ARCH_TEGRA_132_SOC)
+MODULE_FIRMWARE("nvidia/gk20a/fecs_data.bin");
+MODULE_FIRMWARE("nvidia/gk20a/fecs_inst.bin");
+MODULE_FIRMWARE("nvidia/gk20a/gpccs_data.bin");
+MODULE_FIRMWARE("nvidia/gk20a/gpccs_inst.bin");
+MODULE_FIRMWARE("nvidia/gk20a/sw_bundle_init.bin");
+MODULE_FIRMWARE("nvidia/gk20a/sw_ctx.bin");
+MODULE_FIRMWARE("nvidia/gk20a/sw_method_init.bin");
+MODULE_FIRMWARE("nvidia/gk20a/sw_nonctx.bin");
+#endif
-- 
2.4.3

[PATCH v2] nouveau: arm: Add MODULE_FIRMWARE for gk20a

[Alexandre Courbot]

On Tue, Sep 29, 2015 at 12:08 AM, Nicolas Chauvet <kwizart@gmail.com> wrote:
> This patch is needed by initramfs tools to detect
> the required firmware files for the module.
>
> This patch tests for either TEGRA_124_SOC or TEGRA_132_SOC
> for the firmwares related to the Tegra K1 generation.
>
> v2: move the MODULE_FIRMWARE to the nvidia_platform.c file.
>  This will avoid to test for NOUVEAU_PLATFORM_DRIVER

Nice, thanks for doing this change!

Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>

[PATCH v2] nouveau: arm: Add MODULE_FIRMWARE for gk20a

[Alexandre Courbot]

On Wed, Nov 11, 2015 at 6:29 PM, Nicolas Chauvet <kwizart@gmail.com> wrote:
> 2015-09-30 6:57 GMT+02:00 Alexandre Courbot <gnurou@gmail.com>:
>>
>> On Tue, Sep 29, 2015 at 12:08 AM, Nicolas Chauvet <kwizart@gmail.com>
>> wrote:
>> > This patch is needed by initramfs tools to detect
>> > the required firmware files for the module.
>> >
>> > This patch tests for either TEGRA_124_SOC or TEGRA_132_SOC
>> > for the firmwares related to the Tegra K1 generation.
>> >
>> > v2: move the MODULE_FIRMWARE to the nvidia_platform.c file.
>> >  This will avoid to test for NOUVEAU_PLATFORM_DRIVER
>>
>> Nice, thanks for doing this change!
>>
>> Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
>
>
> Thx for the review.
> FYI I've tested the patch on top of 4.3+ kernels, and the initramfs
> generated with dracut works as expected.
>
> Is there any other concern with this patch ?
>
> It's certainly late for 4.4,I would expect it to hit kernel 4.3 at some
> point, but I don't think everything is wired from userspace(Xorg/Wayland)
> wrt dGPU support.
> So It could also wait for 4.5.
> What do you think ?

I don't see a particular reason to hurry, however this patch has been
sitting around for one month now - Ben, is there any particular reason
for not merging it?