From: Dave Airlie <[email protected]> nouveau currently binds to every NVIDIA GPU it encounters. The nova-core driver is being written for GSP-capable (Turing and later) GPUs, so the two drivers compete for the same devices, with whichever registers first winning.
Add the DRM_NOUVEAU_BIND_GSP Kconfig option (default y) and a bind_gsp module parameter, defaulting to the Kconfig value and able to override it in both directions, controlling whether nouveau claims GSP-capable GPUs. When binding is disabled, the GPU is rejected in nvkm_device_ctor(), right after the chipset has been identified and before any subdevs are constructed; constructing subdevs would already load GSP firmware for a GPU that is not going to be used. Pre-Turing GPUs are always bound, as no other driver claims them, and Tegra platform devices are unaffected since nova-core only handles PCI devices. Distributions that want nova-core to be the default driver for GSP-capable GPUs can set CONFIG_DRM_NOUVEAU_BIND_GSP=n; the nouveau.bind_gsp=0 kernel command line parameter switches it at boot time. Signed-off-by: Dave Airlie <[email protected]> --- drivers/gpu/drm/nouveau/Kconfig | 17 +++++++++++++++++ drivers/gpu/drm/nouveau/include/nvkm/core/pci.h | 2 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 9 ++++++++- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 16 +++++++++++++++- drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c | 4 ++-- drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 5 ++++- 7 files changed, 48 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig index 3b5757aed9c8..863cc235838b 100644 --- a/drivers/gpu/drm/nouveau/Kconfig +++ b/drivers/gpu/drm/nouveau/Kconfig @@ -120,3 +120,20 @@ config DRM_NOUVEAU_SIL164 help Support for sil164 and similar single-link (or dual-link when used in pairs) TMDS transmitters. + +config DRM_NOUVEAU_BIND_GSP + bool "Make nouveau the default driver for GSP-capable GPUs" + depends on DRM_NOUVEAU + default y + help + Make nouveau bind to all NVIDIA GPUs by default, as it always + has. + + If another NVIDIA driver, such as nova-core, should claim the + GSP-capable (Turing and later) GPUs instead, say N here; nouveau + then leaves those GPUs to other drivers and continues to bind to + older GPUs itself. nouveau can also be prevented from binding to + GSP-capable GPUs at boot with nouveau.bind_gsp=0 on the kernel + command line. + + If unsure, say Y. diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/pci.h b/drivers/gpu/drm/nouveau/include/nvkm/core/pci.h index 7444c4d59e09..075fe192b26f 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/pci.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/pci.h @@ -10,5 +10,5 @@ struct nvkm_device_pci { }; int nvkm_device_pci_new(struct pci_dev *, const char *cfg, const char *dbg, - struct nvkm_device **); + bool bind_gsp, struct nvkm_device **); #endif diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 5e1336615cf6..582eb0c91b10 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -112,6 +112,11 @@ MODULE_PARM_DESC(runpm, "disable (0), force enable (1), optimus only default (-1 static int nouveau_runtime_pm = -1; module_param_named(runpm, nouveau_runtime_pm, int, 0400); +MODULE_PARM_DESC(bind_gsp, "bind to GSP-capable (Turing and later) GPUs " + "(0 = leave them to other drivers, e.g. nova)"); +static bool nouveau_bind_gsp = IS_ENABLED(CONFIG_DRM_NOUVEAU_BIND_GSP); +module_param_named(bind_gsp, nouveau_bind_gsp, bool, 0400); + static const struct drm_driver driver_legacy_kms; static const struct drm_driver driver_atomic_kms; @@ -881,7 +886,8 @@ static int nouveau_drm_probe(struct pci_dev *pdev, /* We need to check that the chipset is supported before booting * fbdev off the hardware, as there's no way to put it back. */ - ret = nvkm_device_pci_new(pdev, nouveau_config, nouveau_debug, &device); + ret = nvkm_device_pci_new(pdev, nouveau_config, nouveau_debug, + nouveau_bind_gsp, &device); if (ret) return ret; @@ -1460,6 +1466,7 @@ static void nouveau_display_options(void) DRM_DEBUG_DRIVER("... runpm : %d\n", nouveau_runtime_pm); DRM_DEBUG_DRIVER("... vram_pushbuf : %d\n", nouveau_vram_pushbuf); DRM_DEBUG_DRIVER("... hdmimhz : %d\n", nouveau_hdmimhz); + DRM_DEBUG_DRIVER("... bind_gsp : %d\n", nouveau_bind_gsp); } static const struct dev_pm_ops nouveau_pm_ops = { diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c index a2ed8c4fe52a..a027860fa869 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c @@ -3143,7 +3143,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func, const struct nvkm_device_quirk *quirk, struct device *dev, enum nvkm_device_type type, u64 handle, const char *name, const char *cfg, const char *dbg, - struct nvkm_device *device) + bool bind_gsp, struct nvkm_device *device) { struct nvkm_subdev *subdev; u64 mmio_base, mmio_size; @@ -3381,6 +3381,20 @@ nvkm_device_ctor(const struct nvkm_device_func *func, goto done; } + /* Unless nouveau is the default NVIDIA driver, leave GSP-capable + * (Turing and later) PCI GPUs to other drivers, such as nova-core. + * Older GPUs are always bound. + * + * Reject before subdevs are constructed, as that would already load + * GSP firmware for GPUs that are not going to be used. + */ + if (device->func->pci && device->card_type >= TU100 && !bind_gsp) { + nvdev_info(device, "leaving GSP-capable GPU to other drivers " + "(bind_gsp=0)\n"); + ret = -ENODEV; + goto done; + } + /* read strapping information */ strap = nvkm_rd32(device, 0x101000); diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c index 248623b91e29..1477a2fff51f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c @@ -1650,7 +1650,7 @@ nvkm_device_pci_func = { int nvkm_device_pci_new(struct pci_dev *pci_dev, const char *cfg, const char *dbg, - struct nvkm_device **pdevice) + bool bind_gsp, struct nvkm_device **pdevice) { const struct nvkm_device_quirk *quirk = NULL; const struct nvkm_device_pci_device *pcid; @@ -1703,7 +1703,7 @@ nvkm_device_pci_new(struct pci_dev *pci_dev, const char *cfg, const char *dbg, pci_dev->bus->number << 16 | PCI_SLOT(pci_dev->devfn) << 8 | PCI_FUNC(pci_dev->devfn), name, - cfg, dbg, &pdev->device); + cfg, dbg, bind_gsp, &pdev->device); if (ret) return ret; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h index d0c40f034244..a462051d2977 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h @@ -54,7 +54,7 @@ int nvkm_device_ctor(const struct nvkm_device_func *, const struct nvkm_device_quirk *, struct device *, enum nvkm_device_type, u64 handle, const char *name, const char *cfg, const char *dbg, - struct nvkm_device *); + bool bind_gsp, struct nvkm_device *); int nvkm_device_init(struct nvkm_device *); int nvkm_device_fini(struct nvkm_device *, enum nvkm_suspend_state suspend); #endif diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c index 3c8d0878891a..1e69662f91cd 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c @@ -329,9 +329,12 @@ nvkm_device_tegra_new(const struct nvkm_device_tegra_func *func, tdev->gpu_speedo = tegra_sku_info.gpu_speedo_value; tdev->gpu_speedo_id = tegra_sku_info.gpu_speedo_id; + /* Platform devices are always bound, regardless of the bind_gsp + * policy for PCI devices. + */ ret = nvkm_device_ctor(&nvkm_device_tegra_func, NULL, &pdev->dev, NVKM_DEVICE_TEGRA, pdev->id, NULL, - cfg, dbg, &tdev->device); + cfg, dbg, true, &tdev->device); if (ret) goto powerdown; -- 2.56.1
