github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 11:03:43 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/nouveau: create pci device once

Browse Source 
HW isn't touched anymore (aside from detection) until the first
nvif_device has been allocated, so we no longer need a separate
probe-only step before kicking efifb (etc) off the HW.

Signed-off-by: Ben Skeggs <bskeggs@nvidia.com>
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240726043828.58966-5-bskeggs@nvidia.com
This commit is contained in:
Ben Skeggs 2024-07-26 14:37:55 +10:00 committed by Danilo Krummrich
parent 448359c1ce
commit c0bfe34330
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/nouveau/nouveau_drm.c
View File

@ -839,23 +839,16 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
/* We need to check that the chipset is supported before booting /* We need to check that the chipset is supported before booting
* fbdev off the hardware, as there's no way to put it back. * fbdev off the hardware, as there's no way to put it back.
*/ */
ret = nvkm_device_pci_new(pdev, nouveau_config, "error", ret = nvkm_device_pci_new(pdev, nouveau_config, nouveau_debug,
true, false, 0, &device); true, true, ~0ULL, &device);
if (ret) if (ret)
return ret; return ret;
nvkm_device_del(&device);
/* Remove conflicting drivers (vesafb, efifb etc). */ /* Remove conflicting drivers (vesafb, efifb etc). */
ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver_pci); ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver_pci);
if (ret) if (ret)
return ret; return ret;
ret = nvkm_device_pci_new(pdev, nouveau_config, nouveau_debug,
true, true, ~0ULL, &device);
if (ret)
return ret;
pci_set_master(pdev); pci_set_master(pdev);
if (nouveau_atomic) if (nouveau_atomic)