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

drm/nouveau/gr/gm200-: explicitly handle nofw 



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

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

+1 −1
Original line number Diff line number Diff line
@@ -2103,7 +2103,7 @@ gf100_gr_new_(const struct gf100_gr_fwif *fwif, 


	fwif = nvkm_firmware_load(&gr->base.engine.subdev, fwif, "Gr", gr);

	if (IS_ERR(fwif))

		return -ENODEV;

		return PTR_ERR(fwif);



	gr->func = fwif->func;

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

+1 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ int gf100_gr_nofw(struct gf100_gr *, int, const struct gf100_gr_fwif *); 


int gk20a_gr_load_sw(struct gf100_gr *, const char *path, int ver);



int gm200_gr_nofw(struct gf100_gr *, int, const struct gf100_gr_fwif *);

int gm200_gr_load(struct gf100_gr *, int, const struct gf100_gr_fwif *);

extern const struct nvkm_acr_lsf_func gm200_gr_gpccs_acr;

extern const struct nvkm_acr_lsf_func gm200_gr_fecs_acr;

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

+9 −1
Original line number Diff line number Diff line
@@ -32,6 +32,13 @@ 


#include <nvif/class.h>



int

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

{

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

	return -ENODEV;

}



/*******************************************************************************

 * PGRAPH engine/subdev functions

 ******************************************************************************/
@@ -276,6 +283,7 @@ MODULE_FIRMWARE("nvidia/gm206/gr/sw_method_init.bin"); 
static const struct gf100_gr_fwif

gm200_gr_fwif[] = {

	{  0, gm200_gr_load, &gm200_gr, &gm200_gr_fecs_acr, &gm200_gr_gpccs_acr },

	{ -1, gm200_gr_nofw },

	{}

};

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

+2 −1
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ MODULE_FIRMWARE("nvidia/gm20b/gr/sw_method_init.bin"); 
static const struct gf100_gr_fwif

gm20b_gr_fwif[] = {

	{  0, gm20b_gr_load, &gm20b_gr, &gm20b_gr_fecs_acr },

	{ -1, gm200_gr_nofw },

	{}

};

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

+2 −1
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ MODULE_FIRMWARE("nvidia/gp100/gr/sw_method_init.bin"); 
static const struct gf100_gr_fwif

gp100_gr_fwif[] = {

	{  0, gm200_gr_load, &gp100_gr, &gm200_gr_fecs_acr, &gm200_gr_gpccs_acr },

	{ -1, gm200_gr_nofw },

	{}

};