TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vgaarb: remove vga_conflicts

Browse Source 
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: Christoph Hellwig <hch@lst.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210716061634.2446357-3-hch@lst.de
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
Christoph Hellwig
2021-07-16 08:16:29 +02:00
committed by Christian König
parent 77e21b50ac
commit b0b514abc4
2 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/vga/vgaarb.c
-6
View File
@@ -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
include/linux/vgaarb.h
-12
View File
@@ -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),