Commit 876ea7be authored Jun 09, 2017 by Mikko Perttunen Committed by Ben Skeggs Jun 16, 2017

drm/nouveau: Skip vga_fini on non-PCI device



As with vga_init, this function doesn't make sense on non-PCI devices,
and the Thunderbolt check in it dereferences a NULL pointer in that
case. Add some code to skip this function when the device is not a PCI
device.

Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

parent fcd504e3

drivers/gpu/drm/nouveau/nouveau_vga.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,10 @@ nouveau_vga_fini(struct nouveau_drm *drm)
		struct drm_device *dev = drm->dev;
		bool runtime = nouveau_pmops_runtime();

		/* only relevant for PCI devices */
		if (!dev->pdev)
		return;

		vga_client_register(dev->pdev, NULL, NULL, NULL);

		if (pci_is_thunderbolt_attached(dev->pdev))

Admin message