Commit b8779475 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christian König
Browse files

vgaarb: provide a vga_client_unregister wrapper 



Add a trivial wrapper for the unregister case that sets all fields to
NULL.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210716061634.2446357-6-hch@lst.de


Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
parent 6609176f

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+1 −1
Original line number Diff line number Diff line
@@ -3802,7 +3802,7 @@ void amdgpu_device_fini_sw(struct amdgpu_device *adev) 
		vga_switcheroo_fini_domain_pm_ops(adev->dev);

	}

	if ((adev->pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA)

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

		vga_client_unregister(adev->pdev);



	if (IS_ENABLED(CONFIG_PERF_EVENTS))

		amdgpu_pmu_fini(adev);

drivers/gpu/drm/drm_irq.c

+2 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ int drm_irq_install(struct drm_device *dev, int irq) 
	if (ret < 0) {

		dev->irq_enabled = false;

		if (drm_core_check_feature(dev, DRIVER_LEGACY))

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

			vga_client_unregister(to_pci_dev(dev->dev));

		free_irq(irq, dev);

	} else {

		dev->irq = irq;
@@ -198,7 +198,7 @@ int drm_irq_uninstall(struct drm_device *dev) 
	DRM_DEBUG("irq=%d\n", dev->irq);



	if (drm_core_check_feature(dev, DRIVER_LEGACY))

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

		vga_client_unregister(to_pci_dev(dev->dev));



	if (dev->driver->irq_uninstall)

		dev->driver->irq_uninstall(dev);

drivers/gpu/drm/i915/display/intel_vga.c

+1 −1
Original line number Diff line number Diff line
@@ -158,5 +158,5 @@ void intel_vga_unregister(struct drm_i915_private *i915) 
{

	struct pci_dev *pdev = to_pci_dev(i915->drm.dev);



	vga_client_register(pdev, NULL, NULL, NULL);

	vga_client_unregister(pdev);

}

drivers/gpu/drm/nouveau/nouveau_vga.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ nouveau_vga_fini(struct nouveau_drm *drm) 
		return;

	pdev = to_pci_dev(dev->dev);



	vga_client_register(pdev, NULL, NULL, NULL);

	vga_client_unregister(pdev);



	if (pci_is_thunderbolt_attached(pdev))

		return;

drivers/gpu/drm/radeon/radeon_device.c

+1 −1
Original line number Diff line number Diff line
@@ -1530,7 +1530,7 @@ void radeon_device_fini(struct radeon_device *rdev) 
		vga_switcheroo_unregister_client(rdev->pdev);

	if (rdev->flags & RADEON_IS_PX)

		vga_switcheroo_fini_domain_pm_ops(rdev->dev);

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

	vga_client_unregister(rdev->pdev);

	if (rdev->rio_mem)

		pci_iounmap(rdev->pdev, rdev->rio_mem);

	rdev->rio_mem = NULL;