Commit 53dac062 authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/gsp: add support for 570.144 



Add r570-specific HAL routines, and support loading of GSP-RM version
570.144 if firmware is available.

There should be no impact on r535, or non-GSP paths.

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 1b9d7b9d

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

+7 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ ad102_gsp = { 


static struct nvkm_gsp_fwif

ad102_gsps[] = {

	{ 1, tu102_gsp_load, &ad102_gsp, &r570_rm_ga102, "570.144", true },

	{ 0, tu102_gsp_load, &ad102_gsp, &r535_rm_ga102, "535.113.01", true },

	{}

};
@@ -57,3 +58,9 @@ NVKM_GSP_FIRMWARE_BOOTER(ad103, 535.113.01); 
NVKM_GSP_FIRMWARE_BOOTER(ad104, 535.113.01);

NVKM_GSP_FIRMWARE_BOOTER(ad106, 535.113.01);

NVKM_GSP_FIRMWARE_BOOTER(ad107, 535.113.01);



NVKM_GSP_FIRMWARE_BOOTER(ad102, 570.144);

NVKM_GSP_FIRMWARE_BOOTER(ad103, 570.144);

NVKM_GSP_FIRMWARE_BOOTER(ad104, 570.144);

NVKM_GSP_FIRMWARE_BOOTER(ad106, 570.144);

NVKM_GSP_FIRMWARE_BOOTER(ad107, 570.144);

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

+2 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ nvkm_gsp_new_(const struct nvkm_gsp_fwif *fwif, struct nvkm_device *device, 
	gsp->func = fwif->func;



	if (fwif->rm) {

		nvkm_info(&gsp->subdev, "RM version: %s\n", fwif->ver);



		gsp->rm = kzalloc(sizeof(*gsp->rm), GFP_KERNEL);

		if (!gsp->rm)

			return -ENOMEM;

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

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ ga100_gsp = { 


static struct nvkm_gsp_fwif

ga100_gsps[] = {

	{  1, tu102_gsp_load, &ga100_gsp, &r570_rm_tu102, "570.144" },

	{  0, tu102_gsp_load, &ga100_gsp, &r535_rm_tu102, "535.113.01" },

	{ -1, gv100_gsp_nofw, &gv100_gsp },

	{}
@@ -71,3 +72,4 @@ ga100_gsp_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, 
}



NVKM_GSP_FIRMWARE_BOOTER(ga100, 535.113.01);

NVKM_GSP_FIRMWARE_BOOTER(ga100, 570.144);

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

+7 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ ga102_gsp = { 


static struct nvkm_gsp_fwif

ga102_gsps[] = {

	{  1, tu102_gsp_load, &ga102_gsp_r535, &r570_rm_ga102, "570.144" },

	{  0, tu102_gsp_load, &ga102_gsp_r535, &r535_rm_ga102, "535.113.01" },

	{ -1, gv100_gsp_nofw, &ga102_gsp },

	{}
@@ -191,3 +192,9 @@ NVKM_GSP_FIRMWARE_BOOTER(ga103, 535.113.01); 
NVKM_GSP_FIRMWARE_BOOTER(ga104, 535.113.01);

NVKM_GSP_FIRMWARE_BOOTER(ga106, 535.113.01);

NVKM_GSP_FIRMWARE_BOOTER(ga107, 535.113.01);



NVKM_GSP_FIRMWARE_BOOTER(ga102, 570.144);

NVKM_GSP_FIRMWARE_BOOTER(ga103, 570.144);

NVKM_GSP_FIRMWARE_BOOTER(ga104, 570.144);

NVKM_GSP_FIRMWARE_BOOTER(ga106, 570.144);

NVKM_GSP_FIRMWARE_BOOTER(ga107, 570.144);

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -13,3 +13,4 @@ nvkm-y += nvkm/subdev/gsp/rm/ga1xx.o 
nvkm-y += nvkm/subdev/gsp/rm/ad10x.o



include $(src)/nvkm/subdev/gsp/rm/r535/Kbuild

include $(src)/nvkm/subdev/gsp/rm/r570/Kbuild