drm/nouveau: Remove DRM_NOUVEAU_GSP_DEFAULT config

This option was originally intoduced because the GSP code path was
not well tested and we wanted to leave it up to distros which code path
they shipped by default. By now though, the GSP path is probably better
tested than the old firmware eg. Fedora ships GSP by default and we
generally run CTS on GSP. We've always been GSP-only on Ada and later.

So, this path removes the option and effectively sets the option to
always on. We still fall back to the old firmware if GSP is not found.
This change only affects Turing and Ampere.

Users can still set nouveau.config=NvGspRm=0 on the kernel command line
to force using the old firmware on Turing/Ampere.

Signed-off-by: Mel Henning <mhenning@darkrefraction.com>
Reviewed-by: Ben Skeggs <bskeggs@nvidia.com>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Link: https://lore.kernel.org/r/20250811213843.4294-2-mhenning@darkrefraction.com

diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index d1587639ebb04f904d57bcc09933d1e3662594d3..c88776d1e7843ba84cb6ddce935017f994d5f077 100644 (file)
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -102,14 +102,6 @@ config DRM_NOUVEAU_SVM
          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.
-
 config DRM_NOUVEAU_CH7006
        tristate "Chrontel ch7006 TV encoder"
        depends on DRM_NOUVEAU

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c
index 58e233bc53b1fab28ef2215bd10061692d3d2a40..81e56da0474a1d97e0d8d4cb0ac56b9655205c29 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c
@@ -383,13 +383,9 @@ int
 tu102_gsp_load_rm(struct nvkm_gsp *gsp, const struct nvkm_gsp_fwif *fwif)
 {
        struct nvkm_subdev *subdev = &gsp->subdev;
-       bool enable_gsp = fwif->enable;
        int ret;
 
-#if IS_ENABLED(CONFIG_DRM_NOUVEAU_GSP_DEFAULT)
-       enable_gsp = true;
-#endif
-       if (!nvkm_boolopt(subdev->device->cfgopt, "NvGspRm", enable_gsp))
+       if (!nvkm_boolopt(subdev->device->cfgopt, "NvGspRm", true))
                return -EINVAL;
 
        ret = nvkm_gsp_load_fw(gsp, "gsp", fwif->ver, &gsp->fws.rm);