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

drm/nouveau/sec2/gp102: allow module to load when LSFW is missing 



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

drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp102.c

+11 −2
Original line number Diff line number Diff line
@@ -28,6 +28,14 @@ 
#include <nvfw/flcn.h>

#include <nvfw/sec2.h>



int

gp102_sec2_nofw(struct nvkm_sec2 *sec2, int ver,

		const struct nvkm_sec2_fwif *fwif)

{

	nvkm_warn(&sec2->engine.subdev, "firmware unavailable\n");

	return 0;

}



static int

gp102_sec2_acr_bootstrap_falcon_callback(void *priv, struct nvfw_falcon_msg *hdr)

{
@@ -330,6 +338,7 @@ static const struct nvkm_sec2_fwif 
gp102_sec2_fwif[] = {

	{  1, gp102_sec2_load, &gp102_sec2, &gp102_sec2_acr_1 },

	{  0, gp102_sec2_load, &gp102_sec2, &gp102_sec2_acr_0 },

	{ -1, gp102_sec2_nofw, &gp102_sec2 },

	{}

};

drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ struct nvkm_sec2_fwif { 
	const struct nvkm_acr_lsf_func *acr;

};



int gp102_sec2_nofw(struct nvkm_sec2 *, int, const struct nvkm_sec2_fwif *);

int gp102_sec2_load(struct nvkm_sec2 *, int, const struct nvkm_sec2_fwif *);

extern const struct nvkm_sec2_func gp102_sec2;

extern const struct nvkm_acr_lsf_func gp102_sec2_acr_1;

drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c

+1 −8
Original line number Diff line number Diff line
@@ -49,13 +49,6 @@ tu102_sec2 = { 
	.initmsg = gp102_sec2_initmsg,

};



static int

tu102_sec2_nofw(struct nvkm_sec2 *sec2, int ver,

		const struct nvkm_sec2_fwif *fwif)

{

	return 0;

}



MODULE_FIRMWARE("nvidia/tu102/sec2/desc.bin");

MODULE_FIRMWARE("nvidia/tu102/sec2/image.bin");

MODULE_FIRMWARE("nvidia/tu102/sec2/sig.bin");
@@ -75,7 +68,7 @@ MODULE_FIRMWARE("nvidia/tu117/sec2/sig.bin"); 
static const struct nvkm_sec2_fwif

tu102_sec2_fwif[] = {

	{  0, gp102_sec2_load, &tu102_sec2, &gp102_sec2_acr_1 },

	{ -1, tu102_sec2_nofw, &tu102_sec2 }

	{ -1, gp102_sec2_nofw, &tu102_sec2 }

};



int