d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linuxkpi: Update vga_client_register() and add vga_client_unregister()

Browse Source 
For `vga_client_register()`, the API is modified twice in a row. To keep
the API compatible with all commits in the DRM driver, we introduce two
`LINUXKPI_VERSION` version bumps.

Reviewed by:	manu
Approved by:	manu
Differential Revision:	https://reviews.freebsd.org/D38533
This commit is contained in:
Jean-Sébastien Pédron 2023-02-08 18:53:57 +01:00
parent cf54169086
commit 1c6d8146fd
No known key found for this signature in database
GPG Key ID: 39E99761A5FD94CC
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/compat/linuxkpi/common/include/linux/vgaarb.h
View File

@ -239,16 +239,43 @@ static inline int vga_conflicts(struct pci_dev *p1, struct pci_dev *p2)
* by userspace since we some older X servers have issues.
*/
#if defined(CONFIG_VGA_ARB)
#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51501
int vga_client_register(struct pci_dev *pdev,
unsigned int (*set_vga_decode)(struct pci_dev *pdev, bool state));
#elif defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51500
int vga_client_register(struct pci_dev *pdev, void *cookie,
unsigned int (*set_vga_decode)(void *cookie, bool state));
#else
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));
#endif
#else
#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51501
static inline int vga_client_register(struct pci_dev *pdev,
unsigned int (*set_vga_decode)(struct pci_dev *pdev, bool state))
#elif defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51500
static inline int vga_client_register(struct pci_dev *pdev, void *cookie,
unsigned int (*set_vga_decode)(void *cookie, bool state))
#else
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))
#endif
{
return 0;
}
static inline int vga_client_unregister(struct pci_dev *pdev)
{
#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51501
return (vga_client_register(NULL, NULL));
#elif defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51500
return (vga_client_register(NULL, NULL, NULL));
#else
return (vga_client_register(NULL, NULL, NULL, NULL));
#endif
}
#endif
#endif /* _LINUXKPI_LINUX_VGA_H_ */