Commit b0b514ab authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christian König

vgaarb: remove vga_conflicts

vga_conflicts only has a single caller and none of the arch overrides
mentioned in the comment.  Just remove it and the thus dead check in the
caller.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210716061634.2446357-3-hch@lst.deAcked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
parent 77e21b50
...@@ -284,12 +284,6 @@ static struct vga_device *__vga_tryget(struct vga_device *vgadev, ...@@ -284,12 +284,6 @@ static struct vga_device *__vga_tryget(struct vga_device *vgadev,
if (vgadev == conflict) if (vgadev == conflict)
continue; continue;
/* Check if the architecture allows a conflict between those
* 2 devices or if they are on separate domains
*/
if (!vga_conflicts(vgadev->pdev, conflict->pdev))
continue;
/* We have a possible conflict. before we go further, we must /* We have a possible conflict. before we go further, we must
* check if we sit on the same bus as the conflicting device. * check if we sit on the same bus as the conflicting device.
* if we don't, then we must tie both IO and MEM resources * if we don't, then we must tie both IO and MEM resources
......
...@@ -122,18 +122,6 @@ static inline void vga_set_default_device(struct pci_dev *pdev) { } ...@@ -122,18 +122,6 @@ static inline void vga_set_default_device(struct pci_dev *pdev) { }
static inline int vga_remove_vgacon(struct pci_dev *pdev) { return 0; } static inline int vga_remove_vgacon(struct pci_dev *pdev) { return 0; }
#endif #endif
/*
* Architectures should define this if they have several
* independent PCI domains that can afford concurrent VGA
* decoding
*/
#ifndef __ARCH_HAS_VGA_CONFLICT
static inline int vga_conflicts(struct pci_dev *p1, struct pci_dev *p2)
{
return 1;
}
#endif
#if defined(CONFIG_VGA_ARB) #if defined(CONFIG_VGA_ARB)
int vga_client_register(struct pci_dev *pdev, void *cookie, int vga_client_register(struct pci_dev *pdev, void *cookie,
void (*irq_set_state)(void *cookie, bool state), void (*irq_set_state)(void *cookie, bool state),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment