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

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: default avatarChristoph Hellwig <hch@lst.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210716061634.2446357-7-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 b8779475

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

+1 −1
Original line number Diff line number Diff line
@@ -3679,7 +3679,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	/* 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;

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/nouveau/nouveau_vga.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

drivers/gpu/drm/radeon/radeon_device.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/vga/vgaarb.c

+1 −22
Original line number Diff line number Diff line
@@ -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,11 +316,9 @@ 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)

			flags |= PCI_VGA_STATE_CHANGE_BRIDGE;
@@ -365,9 +354,6 @@ static struct vga_device *__vga_tryget(struct vga_device *vgadev, 


	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;