Commit 57fe0d30 authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/gsp: add hal for wpr config info + meta init 



545.23.06 increases the libos3 heap size requirements, and GH100/GBxxx
will need their own implementation entirely.

Signed-off-by: default avatarBen Skeggs <bskeggs@nvidia.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarTimur Tabi <ttabi@nvidia.com>
Tested-by: default avatarTimur Tabi <ttabi@nvidia.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 38cafe9b

drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ struct nvkm_gsp_mem { 
	dma_addr_t addr;

};



int nvkm_gsp_mem_ctor(struct nvkm_gsp *, size_t size, struct nvkm_gsp_mem *);

void nvkm_gsp_mem_dtor(struct nvkm_gsp_mem *);



struct nvkm_gsp_radix3 {

	struct nvkm_gsp_mem lvl0;

	struct nvkm_gsp_mem lvl1;

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c

+0 −4
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@ ad102_gsp = { 


	.sig_section = ".fwsignature_ad10x",



	.wpr_heap.os_carveout_size = 20 << 20,

	.wpr_heap.base_size = 8 << 20,

	.wpr_heap.min_size = 84 << 20,



	.booter.ctor = ga102_gsp_booter_ctor,



	.dtor = r535_gsp_dtor,

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ nvkm_gsp_new_(const struct nvkm_gsp_fwif *fwif, struct nvkm_device *device, 


		gsp->rm->device = device;

		gsp->rm->gpu = fwif->func->rm.gpu;

		gsp->rm->wpr = fwif->rm->wpr;

		gsp->rm->api = fwif->rm->api;

	}

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c

+0 −3
Original line number Diff line number Diff line
@@ -45,9 +45,6 @@ ga100_gsp = { 


	.sig_section = ".fwsignature_ga100",



	.wpr_heap.base_size = 8 << 20,

	.wpr_heap.min_size = 64 << 20,



	.booter.ctor = tu102_gsp_booter_ctor,



	.dtor = r535_gsp_dtor,

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c

+0 −4
Original line number Diff line number Diff line
@@ -156,10 +156,6 @@ ga102_gsp_r535 = { 


	.sig_section = ".fwsignature_ga10x",



	.wpr_heap.os_carveout_size = 20 << 20,

	.wpr_heap.base_size = 8 << 20,

	.wpr_heap.min_size = 84 << 20,



	.booter.ctor = ga102_gsp_booter_ctor,



	.dtor = r535_gsp_dtor,