Commit c0bfe343 authored by Ben Skeggs's avatar Ben Skeggs Committed by Danilo Krummrich
Browse files

drm/nouveau: create pci device once 



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: default avatarBen Skeggs <bskeggs@nvidia.com>
Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240726043828.58966-5-bskeggs@nvidia.com
parent 448359c1

drivers/gpu/drm/nouveau/nouveau_drm.c

+2 −9
Original line number Diff line number Diff line
@@ -839,23 +839,16 @@ 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, "error",

				  true, false, 0, &device);

	ret = nvkm_device_pci_new(pdev, nouveau_config, nouveau_debug,

				  true, true, ~0ULL, &device);

	if (ret)

		return ret;



	nvkm_device_del(&device);



	/* Remove conflicting drivers (vesafb, efifb etc). */

	ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver_pci);

	if (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);



	if (nouveau_atomic)