mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

drm/pci: Hide legacy PCI functions from non-legacy code 

Declarations of drm_legacy_pci_{init,exit}() are being moved to
drm_legacy.h. CONFIG_DRM_LEGACY protects the implementation.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191203100406.9674-3-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2019-12-03 11:03:56 +01:00
parent 5c7a0bb0cf
commit 1be9d5f069
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/drm_pci.c
View File

@ -282,6 +282,8 @@ err_free:
}
EXPORT_SYMBOL(drm_get_pci_dev);
#ifdef CONFIG_DRM_LEGACY
/**
* drm_legacy_pci_init - shadow-attach a legacy DRM PCI driver
* @driver: DRM device driver
@ -354,3 +356,5 @@ void drm_legacy_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver)
DRM_INFO("Module unloaded\n");
}
EXPORT_SYMBOL(drm_legacy_pci_exit);
#endif

29
include/drm/drm_legacy.h
View File

@ -38,7 +38,9 @@
#include <drm/drm_hashtab.h>
struct drm_device;
struct drm_driver;
struct file;
struct pci_driver;
/*
* Legacy Support for palateontologic DRM drivers
@ -188,8 +190,33 @@ do { \
void drm_legacy_idlelock_take(struct drm_lock_data *lock);
void drm_legacy_idlelock_release(struct drm_lock_data *lock);
/* drm_pci.c dma alloc wrappers */
/* drm_pci.c */
#ifdef CONFIG_PCI
void __drm_legacy_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
int drm_legacy_pci_init(struct drm_driver *driver, struct pci_driver *pdriver);
void drm_legacy_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver);
#else
static inline void __drm_legacy_pci_free(struct drm_device *dev,
drm_dma_handle_t *dmah)
{
}
static inline int drm_legacy_pci_init(struct drm_driver *driver,
struct pci_driver *pdriver)
{
return -EINVAL;
}
static inline void drm_legacy_pci_exit(struct drm_driver *driver,
struct pci_driver *pdriver)
{
}
#endif
/* drm_memory.c */
void drm_legacy_ioremap(struct drm_local_map *map, struct drm_device *dev);

15
include/drm/drm_pci.h
View File

@ -38,7 +38,6 @@ struct drm_dma_handle;
struct drm_device;
struct drm_driver;
struct drm_master;
struct pci_device;
#ifdef CONFIG_PCI
@ -50,9 +49,6 @@ int drm_get_pci_dev(struct pci_dev *pdev,
const struct pci_device_id *ent,
struct drm_driver *driver);
int drm_legacy_pci_init(struct drm_driver *driver, struct pci_driver *pdriver);
void drm_legacy_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver);
#else
static inline struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev,
@ -73,17 +69,6 @@ static inline int drm_get_pci_dev(struct pci_dev *pdev,
return -ENOSYS;
}
static inline int drm_legacy_pci_init(struct drm_driver *driver,
struct pci_driver *pdriver)
{
return -EINVAL;
}
static inline void drm_legacy_pci_exit(struct drm_driver *driver,
struct pci_driver *pdriver)
{
}
#endif
#endif /* _DRM_PCI_H_ */