vgaarb: remove the unused irq_set_state argument to vga_client_register

All callers pass NULL as the irq_set_state argument, so remove it and
the ->irq_set_state member in struct vga_device.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210716061634.2446357-7-hch@lst.de
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index d18bfceefcbc304427df0809a57eb4396f9b9dea..3c817f7e9ae8402f908ebc62cf3738239f30eb5f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3679,7 +3679,7 @@ fence_driver_init:
        /* this will fail for cards that aren't VGA class devices, just
         * ignore it */
        if ((adev->pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA)
-               vga_client_register(adev->pdev, adev, NULL, amdgpu_device_vga_set_decode);
+               vga_client_register(adev->pdev, adev, amdgpu_device_vga_set_decode);
 
        if (amdgpu_device_supports_px(ddev)) {
                px = true;

diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c
index 833f9ec14493885409f76603e304567496c581a4..0222719e0824cac00330819ab0251d00d41dac98 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vga.c
+++ b/drivers/gpu/drm/i915/display/intel_vga.c
@@ -147,7 +147,7 @@ int intel_vga_register(struct drm_i915_private *i915)
         * then we do not take part in VGA arbitration and the
         * vga_client_register() fails with -ENODEV.
         */
-       ret = vga_client_register(pdev, i915, NULL, intel_vga_set_decode);
+       ret = vga_client_register(pdev, i915, intel_vga_set_decode);
        if (ret && ret != -ENODEV)
                return ret;
 

diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
index de7a3a860139c1d91a1319cc1dc92a76e8c76964..d071c11249a3038181d733f29d650a4acbf8af89 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
@@ -94,7 +94,7 @@ nouveau_vga_init(struct nouveau_drm *drm)
                return;
        pdev = to_pci_dev(dev->dev);
 
-       vga_client_register(pdev, dev, NULL, nouveau_vga_set_decode);
+       vga_client_register(pdev, dev, nouveau_vga_set_decode);
 
        /* don't register Thunderbolt eGPU with vga_switcheroo */
        if (pci_is_thunderbolt_attached(pdev))

diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index d781914f8bcb632cdad33b7037c0f5144f3f2e68..11e8e42d99b3e9c43351bc6111eaaaef20cc3d6c 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1434,7 +1434,7 @@ int radeon_device_init(struct radeon_device *rdev,
        /* if we have > 1 VGA cards, then disable the radeon VGA resources */
        /* this will fail for cards that aren't VGA class devices, just
         * ignore it */
-       vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
+       vga_client_register(rdev->pdev, rdev, radeon_vga_set_decode);
 
        if (rdev->flags & RADEON_IS_PX)
                runtime = true;

diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index 85b765b80abfeeb2d38823a0bec989dc087ebe8b..4bde017f6f22ffda8b830b1d21cc894a3862377d 100644 (file)
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -72,9 +72,7 @@ struct vga_device {
        unsigned int io_norm_cnt;       /* normal IO count */
        unsigned int mem_norm_cnt;      /* normal MEM count */
        bool bridge_has_one_vga;
-       /* allow IRQ enable/disable hook */
        void *cookie;
-       void (*irq_set_state)(void *cookie, bool enable);
        unsigned int (*set_vga_decode)(void *cookie, bool decode);
 };
 
@@ -218,13 +216,6 @@ int vga_remove_vgacon(struct pci_dev *pdev)
 #endif
 EXPORT_SYMBOL(vga_remove_vgacon);
 
-static inline void vga_irq_set_state(struct vga_device *vgadev, bool state)
-{
-       if (vgadev->irq_set_state)
-               vgadev->irq_set_state(vgadev->cookie, state);
-}
-
-
 /* If we don't ever use VGA arb we should avoid
    turning off anything anywhere due to old X servers getting
    confused about the boot device not being VGA */
@@ -325,10 +316,8 @@ static struct vga_device *__vga_tryget(struct vga_device *vgadev,
                        if ((match & conflict->decodes) & VGA_RSRC_LEGACY_IO)
                                pci_bits |= PCI_COMMAND_IO;
 
-                       if (pci_bits) {
-                               vga_irq_set_state(conflict, false);
+                       if (pci_bits)
                                flags |= PCI_VGA_STATE_CHANGE_DECODES;
-                       }
                }
 
                if (change_bridge)
@@ -365,9 +354,6 @@ enable_them:
 
        pci_set_vga_state(vgadev->pdev, true, pci_bits, flags);
 
-       if (!vgadev->bridge_has_one_vga)
-               vga_irq_set_state(vgadev, true);
-
        vgadev->owns |= wants;
 lock_them:
        vgadev->locks |= (rsrc & VGA_RSRC_LEGACY_MASK);
@@ -855,15 +841,10 @@ EXPORT_SYMBOL(vga_set_legacy_decoding);
  * vga_client_register - register or unregister a VGA arbitration client
  * @pdev: pci device of the VGA client
  * @cookie: client cookie to be used in callbacks
- * @irq_set_state: irq state change callback
  * @set_vga_decode: vga decode change callback
  *
  * Clients have two callback mechanisms they can use.
  *
- * @irq_set_state callback: If a client can't disable its GPUs VGA
- * resources, then we need to be able to ask it to turn off its irqs when we
- * turn off its mem and io decoding.
- *
  * @set_vga_decode callback: If a client can disable its GPU VGA resource, it
  * will get a callback from this to set the encode/decode state.
  *
@@ -882,7 +863,6 @@ EXPORT_SYMBOL(vga_set_legacy_decoding);
  * Returns: 0 on success, -1 on failure
  */
 int vga_client_register(struct pci_dev *pdev, void *cookie,
-                       void (*irq_set_state)(void *cookie, bool state),
                        unsigned int (*set_vga_decode)(void *cookie,
                                                       bool decode))
 {
@@ -895,7 +875,6 @@ int vga_client_register(struct pci_dev *pdev, void *cookie,
        if (!vgadev)
                goto bail;
 
-       vgadev->irq_set_state = irq_set_state;
        vgadev->set_vga_decode = set_vga_decode;
        vgadev->cookie = cookie;
        ret = 0;

diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 1dd2c58dcd2b47777ed2184cde8784ccd7fb7f04..b038900fee48b91e9ff07bcdfe3ef92791aabc94 100644 (file)
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -1951,7 +1951,7 @@ static int vfio_pci_vga_init(struct vfio_pci_device *vdev)
        if (!vfio_pci_is_vga(pdev))
                return 0;
 
-       ret = vga_client_register(pdev, vdev, NULL, vfio_pci_set_vga_decode);
+       ret = vga_client_register(pdev, vdev, vfio_pci_set_vga_decode);
        if (ret)
                return ret;
        vga_set_legacy_decoding(pdev, vfio_pci_set_vga_decode(vdev, false));

diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index 7bca61a08700a4128b9419ca4ad0ab9ab6a160fe..ea45d3e86fff328dcec0c06c4b7eefb684e0b611 100644 (file)
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -52,7 +52,6 @@ struct pci_dev *vga_default_device(void);
 void vga_set_default_device(struct pci_dev *pdev);
 int vga_remove_vgacon(struct pci_dev *pdev);
 int vga_client_register(struct pci_dev *pdev, void *cookie,
-                       void (*irq_set_state)(void *cookie, bool state),
                        unsigned int (*set_vga_decode)(void *cookie, bool state));
 #else /* CONFIG_VGA_ARB */
 static inline void vga_set_legacy_decoding(struct pci_dev *pdev,
@@ -79,7 +78,6 @@ static inline int vga_remove_vgacon(struct pci_dev *pdev)
        return 0;
 }
 static inline int vga_client_register(struct pci_dev *pdev, void *cookie,
-                                     void (*irq_set_state)(void *cookie, bool state),
                                      unsigned int (*set_vga_decode)(void *cookie, bool state))
 {
        return 0;
@@ -118,7 +116,7 @@ static inline int vga_get_uninterruptible(struct pci_dev *pdev,
 
 static inline void vga_client_unregister(struct pci_dev *pdev)
 {
-       vga_client_register(pdev, NULL, NULL, NULL);
+       vga_client_register(pdev, NULL, NULL);
 }
 
 #endif /* LINUX_VGA_H */