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

Commit 336c4652 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

drm/nouveau/gr/gk20a: move firmware bundle release to gf100 



Some members of gf100_gr were freed by the gk20a driver. That's not
where it should be done - free them in gf100 so other chips that use
NVIDIA-provided firmware free these structures properly.

This also removes the need for a GK20A-specific destructor.

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

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

+11 −0
Original line number Diff line number Diff line
@@ -1684,6 +1684,12 @@ gf100_gr_dtor_fw(struct gf100_gr_fuc *fuc) 
	fuc->data = NULL;

}



static void

gf100_gr_dtor_init(struct gf100_gr_pack *pack)

{

	vfree(pack);

}



void *

gf100_gr_dtor(struct nvkm_gr *base)

{
@@ -1698,6 +1704,11 @@ gf100_gr_dtor(struct nvkm_gr *base) 
	gf100_gr_dtor_fw(&gr->fuc41ac);

	gf100_gr_dtor_fw(&gr->fuc41ad);



	gf100_gr_dtor_init(gr->fuc_bundle);

	gf100_gr_dtor_init(gr->fuc_method);

	gf100_gr_dtor_init(gr->fuc_sw_ctx);

	gf100_gr_dtor_init(gr->fuc_sw_nonctx);



	nvkm_memory_del(&gr->unk4188b8);

	nvkm_memory_del(&gr->unk4188b4);

	return gr;

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

+1 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ struct gf100_gr { 


	/*

	 * Used if the register packs are loaded from NVIDIA fw instead of

	 * using hardcoded arrays.

	 * using hardcoded arrays. To be allocated with vzalloc().

	 */

	struct gf100_gr_pack *fuc_sw_nonctx;

	struct gf100_gr_pack *fuc_sw_ctx;
@@ -140,7 +140,6 @@ int gk104_gr_init(struct gf100_gr *); 


int gk20a_gr_new_(const struct gf100_gr_func *, struct nvkm_device *,

		  int, struct nvkm_gr **);

void gk20a_gr_dtor(struct gf100_gr *);

int gk20a_gr_init(struct gf100_gr *);



int gm200_gr_init(struct gf100_gr *);

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

+0 −16
Original line number Diff line number Diff line
@@ -26,12 +26,6 @@ 


#include <nvif/class.h>



static void

gk20a_gr_init_dtor(struct gf100_gr_pack *pack)

{

	vfree(pack);

}



struct gk20a_fw_av

{

	u32 addr;
@@ -273,15 +267,6 @@ gk20a_gr_init(struct gf100_gr *gr) 
	return gf100_gr_init_ctxctl(gr);

}



void

gk20a_gr_dtor(struct gf100_gr *gr)

{

	gk20a_gr_init_dtor(gr->fuc_method);

	gk20a_gr_init_dtor(gr->fuc_bundle);

	gk20a_gr_init_dtor(gr->fuc_sw_ctx);

	gk20a_gr_init_dtor(gr->fuc_sw_nonctx);

}



int

gk20a_gr_new_(const struct gf100_gr_func *func, struct nvkm_device *device,

	      int index, struct nvkm_gr **pgr)
@@ -335,7 +320,6 @@ gk20a_gr_new_(const struct gf100_gr_func *func, struct nvkm_device *device, 


static const struct gf100_gr_func

gk20a_gr = {

	.dtor = gk20a_gr_dtor,

	.init = gk20a_gr_init,

	.set_hww_esr_report_mask = gk20a_gr_set_hww_esr_report_mask,

	.ppc_nr = 1,

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

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ gm20b_gr_set_hww_esr_report_mask(struct gf100_gr *gr) 


static const struct gf100_gr_func

gm20b_gr = {

	.dtor = gk20a_gr_dtor,

	.init = gk20a_gr_init,

	.init_gpc_mmu = gm20b_gr_init_gpc_mmu,

	.set_hww_esr_report_mask = gm20b_gr_set_hww_esr_report_mask,