Commit 594766ca authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/gsp: move booter handling to GPU-specific code 



GH100/GBxxx have significant changes to the GSP-RM boot process.

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 7f022236

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

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ ad102_gsp_r535_113_01 = { 


	.dtor = r535_gsp_dtor,

	.oneinit = tu102_gsp_oneinit,

	.init = r535_gsp_init,

	.fini = r535_gsp_fini,

	.init = tu102_gsp_init,

	.fini = tu102_gsp_fini,

	.reset = ga102_gsp_reset,



	.rm = &r535_gsp_rm,

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

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ nvkm_gsp_fini(struct nvkm_subdev *subdev, bool suspend) 
{

	struct nvkm_gsp *gsp = nvkm_gsp(subdev);



	if (!gsp->func->fini)

	if (!gsp->func->fini || !gsp->running)

		return 0;



	return gsp->func->fini(gsp, suspend);

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

+2 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ ga100_gsp_r535_113_01 = { 


	.dtor = r535_gsp_dtor,

	.oneinit = tu102_gsp_oneinit,

	.init = r535_gsp_init,

	.fini = r535_gsp_fini,

	.init = tu102_gsp_init,

	.fini = tu102_gsp_fini,

	.reset = tu102_gsp_reset,



	.rm = &r535_gsp_rm,

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

+2 −2
Original line number Diff line number Diff line
@@ -164,8 +164,8 @@ ga102_gsp_r535_113_01 = { 


	.dtor = r535_gsp_dtor,

	.oneinit = tu102_gsp_oneinit,

	.init = r535_gsp_init,

	.fini = r535_gsp_fini,

	.init = tu102_gsp_init,

	.fini = tu102_gsp_fini,

	.reset = ga102_gsp_reset,



	.rm = &r535_gsp_rm,

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

+3 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ extern const struct nvkm_falcon_fw_func tu102_gsp_fwsec; 
int tu102_gsp_booter_ctor(struct nvkm_gsp *, const char *, const struct firmware *,

			  struct nvkm_falcon *, struct nvkm_falcon_fw *);

int tu102_gsp_oneinit(struct nvkm_gsp *);

int tu102_gsp_init(struct nvkm_gsp *);

int tu102_gsp_fini(struct nvkm_gsp *, bool suspend);

int tu102_gsp_reset(struct nvkm_gsp *);



extern const struct nvkm_falcon_func ga102_gsp_flcn;
@@ -72,6 +74,7 @@ int r535_gsp_oneinit(struct nvkm_gsp *); 
int r535_gsp_init(struct nvkm_gsp *);

int r535_gsp_fini(struct nvkm_gsp *, bool suspend);

extern const struct nvkm_gsp_rm r535_gsp_rm;

int r535_gsp_rmargs_init(struct nvkm_gsp *gsp, bool resume);



int nvkm_gsp_new_(const struct nvkm_gsp_fwif *, struct nvkm_device *, enum nvkm_subdev_type, int,

		  struct nvkm_gsp **);