Commit fb172f5f authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gk20a: move MODULE_FIRMWARE firmware definitions 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent d2bcfce7

drivers/gpu/drm/nouveau/nouveau_platform.c

+0 −11
Original line number Diff line number Diff line
@@ -95,14 +95,3 @@ 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

drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c

+11 −0
Original line number Diff line number Diff line
@@ -319,6 +319,17 @@ gk20a_gr_load_sw(struct gf100_gr *gr, const char *path, int ver) 
	return 0;

}



#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



static int

gk20a_gr_load(struct gf100_gr *gr, int ver, const struct gf100_gr_fwif *fwif)

{