Commit 1d492944 authored by Dave Airlie's avatar Dave Airlie
Browse files

nouveau/gsp: add kconfig option to enable GSP paths by default 



Turing and Ampere will continue to use the old paths by default,
but we should allow distros to decide what the policy is.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240214040632.661069-1-airlied@gmail.com
parent 7c548869

drivers/gpu/drm/nouveau/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -100,3 +100,11 @@ config DRM_NOUVEAU_SVM 
	help

	  Say Y here if you want to enable experimental support for

	  Shared Virtual Memory (SVM).



config DRM_NOUVEAU_GSP_DEFAULT

	bool "Use GSP firmware for Turing/Ampere (needs firmware installed)"

	depends on DRM_NOUVEAU

	default n

	help

	  Say Y here if you want to use the GSP codepaths by default on

	  Turing and Ampere GPUs.

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

+5 −1
Original line number Diff line number Diff line
@@ -2312,8 +2312,12 @@ r535_gsp_load(struct nvkm_gsp *gsp, int ver, const struct nvkm_gsp_fwif *fwif) 
{

	struct nvkm_subdev *subdev = &gsp->subdev;

	int ret;

	bool enable_gsp = fwif->enable;



	if (!nvkm_boolopt(subdev->device->cfgopt, "NvGspRm", fwif->enable))

#if IS_ENABLED(CONFIG_DRM_NOUVEAU_GSP_DEFAULT)

	enable_gsp = true;

#endif

	if (!nvkm_boolopt(subdev->device->cfgopt, "NvGspRm", enable_gsp))

		return -EINVAL;



	if ((ret = r535_gsp_load_fw(gsp, "gsp", fwif->ver, &gsp->fws.rm)) ||