Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18cd5bc8 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

drm/nouveau/gr/gf100: load firmware in outer function 



The firmwares required by GR may vary from chip to chip, especially with
the introduction of secure boot and NVIDIA-provided firmwares. Move the
firmware loading outside of gf100_gr_ctor so other chips may still call
it while managing their firmwares themselves.

Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 336c4652

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

+16 −10
Original line number Diff line number Diff line
@@ -1762,15 +1762,6 @@ gf100_gr_ctor(const struct gf100_gr_func *func, struct nvkm_device *device, 
	if (ret)

		return ret;



	if (gr->firmware) {

		nvkm_info(&gr->base.engine.subdev, "using external firmware\n");

		if (gf100_gr_ctor_fw(gr, "fecs_inst", &gr->fuc409c) ||

		    gf100_gr_ctor_fw(gr, "fecs_data", &gr->fuc409d) ||

		    gf100_gr_ctor_fw(gr, "gpccs_inst", &gr->fuc41ac) ||

		    gf100_gr_ctor_fw(gr, "gpccs_data", &gr->fuc41ad))

			return -ENODEV;

	}



	return 0;

}
@@ -1779,10 +1770,25 @@ gf100_gr_new_(const struct gf100_gr_func *func, struct nvkm_device *device, 
	      int index, struct nvkm_gr **pgr)

{

	struct gf100_gr *gr;

	int ret;



	if (!(gr = kzalloc(sizeof(*gr), GFP_KERNEL)))

		return -ENOMEM;

	*pgr = &gr->base;

	return gf100_gr_ctor(func, device, index, gr);



	ret = gf100_gr_ctor(func, device, index, gr);

	if (ret)

		return ret;



	if (gr->firmware) {

		if (gf100_gr_ctor_fw(gr, "fecs_inst", &gr->fuc409c) ||

		    gf100_gr_ctor_fw(gr, "fecs_data", &gr->fuc409d) ||

		    gf100_gr_ctor_fw(gr, "gpccs_inst", &gr->fuc41ac) ||

		    gf100_gr_ctor_fw(gr, "gpccs_data", &gr->fuc41ad))

			return -ENODEV;

	}



	return 0;

}



int

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

+6 −0
Original line number Diff line number Diff line
@@ -283,6 +283,12 @@ gk20a_gr_new_(const struct gf100_gr_func *func, struct nvkm_device *device, 
	if (ret)

		return ret;



	if (gf100_gr_ctor_fw(gr, "fecs_inst", &gr->fuc409c) ||

	    gf100_gr_ctor_fw(gr, "fecs_data", &gr->fuc409d) ||

	    gf100_gr_ctor_fw(gr, "gpccs_inst", &gr->fuc41ac) ||

	    gf100_gr_ctor_fw(gr, "gpccs_data", &gr->fuc41ad))

		return -ENODEV;



	ret = gf100_gr_ctor_fw(gr, "sw_nonctx", &fuc);

	if (ret)

		return ret;