drm/legacy: remove some pci legacy code if not needed.
Subsystems (2)
Dave Airlie
maintainerPATCH 1/1 drm/legacy: remove some pci legacy code if not needed.
From: Dave Airlie <[email protected]>
The legacy device list and pci legacy init/exit don't need to be built if not supporting legacy.
Signed-off-by Dave Airlie <[email protected]>
--- drivers/gpu/drm/drm_pci.c | 8 ++++++-- include/drm/drm_device.h | 10 +++------- include/drm/drm_pci.h | 2 ++ 3 files changed, 11 insertions(+), 9 deletions(-)
drivers/gpu/drm/drm_pci.c +6 -2
@@ -265,9 +265,10 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,/* No locking needed since shadow-attach is single-threaded since it may * only be called from the per-driver module init hook. */ +#if IS_ENABLED (CONFIG_DRM_LEGACY )if (drm_core_check_feature (dev,DRIVER_LEGACY ))list_add_tail (&dev->legacy_dev_list, &driver->legacy_dev_list); - +#endif return 0 ; err_agp:
@@ -279,6 +280,7 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent, }EXPORT_SYMBOL (drm_get_pci_dev); +#if IS_ENABLED (CONFIG_DRM_LEGACY )/** * drm_legacy_pci_init - shadow-attach a legacy DRM PCI driver * @driver: DRM device driver
@@ -325,7 +327,7 @@ int drm_legacy_pci_init(struct drm_driver *driver, struct pci_driver *pdriver) return 0; }EXPORT_SYMBOL (drm_legacy_pci_init); - +#endif #else void drm_pci_agp_destroy (struct drm_device *dev) {}
@@ -337,6 +339,7 @@ int drm_irq_by_busid(struct drm_device *dev, void *data, }#endif +#if IS_ENABLED (CONFIG_DRM_LEGACY )/** * drm_legacy_pci_exit - unregister shadow-attach legacy DRM driver * @driver: DRM device driver
@@ -362,3 +365,4 @@ 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
include/drm/drm_device.h +3 -7
@@ -50,13 +50,6 @@ enum switch_power_state {* may contain multiple heads. */ struct drm_device { -/** -* @legacy_dev_list: -* -* List of devices per driver for stealth attach cleanup -*/ -struct list_head legacy_dev_list; -/** @if_version: Highest interface version set */ int if_version;
@@ -307,6 +300,9 @@ struct drm_device {/* Everything below here is for legacy driver, never use! */ /* private: */ #if IS_ENABLED (CONFIG_DRM_LEGACY ) +/* List of devices per driver for stealth attach cleanup */ +struct list_head legacy_dev_list; +/* Context handle management - linked list of context handles */ struct list_head ctxlist;
include/drm/drm_pci.h +2 -0
@@ -43,8 +43,10 @@ struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size, size_t align);void drm_pci_free (struct drm_device *dev,struct drm_dma_handle * dmah); +#if IS_ENABLED (CONFIG_DRM_LEGACY )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); +#endif #ifdef CONFIG_PCI int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 91 lines · Dave Airlie
From: Dave Airlie <[email protected]>
The legacy device list and pci legacy init/exit don't need to be built if not supporting legacy.
Signed-off-by Dave Airlie <[email protected]>--- drivers/gpu/drm/drm_pci.c | 8 ++++++-- include/drm/drm_device.h | 10 +++------- include/drm/drm_pci.h | 2 ++ 3 files changed, 11 insertions(+), 9 deletions(-)drivers/gpu/drm/drm_pci.c +6
-2@@ -265,9 +265,10 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,/* No locking needed since shadow-attach is single-threaded since it may * only be called from the per-driver module init hook. */ +#if IS_ENABLED (CONFIG_DRM_LEGACY )if (drm_core_check_feature (dev,DRIVER_LEGACY ))list_add_tail (&dev->legacy_dev_list, &driver->legacy_dev_list); - +#endif return 0 ; err_agp:@@ -279,6 +280,7 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent, }EXPORT_SYMBOL (drm_get_pci_dev); +#if IS_ENABLED (CONFIG_DRM_LEGACY )/** * drm_legacy_pci_init - shadow-attach a legacy DRM PCI driver * @driver: DRM device driver @@ -325,7 +327,7 @@ int drm_legacy_pci_init(struct drm_driver *driver, struct pci_driver *pdriver) return 0; }EXPORT_SYMBOL (drm_legacy_pci_init); - +#endif #else void drm_pci_agp_destroy (struct drm_device *dev) {}@@ -337,6 +339,7 @@ int drm_irq_by_busid(struct drm_device *dev, void *data, }#endif +#if IS_ENABLED (CONFIG_DRM_LEGACY )/** * drm_legacy_pci_exit - unregister shadow-attach legacy DRM driver * @driver: DRM device driver @@ -362,3 +365,4 @@ 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 include/drm/drm_device.h +3
-7@@ -50,13 +50,6 @@ enum switch_power_state {* may contain multiple heads. */ struct drm_device { -/** -* @legacy_dev_list: -* -* List of devices per driver for stealth attach cleanup -*/ -struct list_head legacy_dev_list; -/** @if_version: Highest interface version set */ int if_version;@@ -307,6 +300,9 @@ struct drm_device {/* Everything below here is for legacy driver, never use! */ /* private: */ #if IS_ENABLED (CONFIG_DRM_LEGACY ) +/* List of devices per driver for stealth attach cleanup */ +struct list_head legacy_dev_list; +/* Context handle management - linked list of context handles */ struct list_head ctxlist;include/drm/drm_pci.h +0
-0
include/drm/drm_pci.h struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size, · line 49
Quoted 7 lines
include/drm/drm_pci.h +2
-0@@ -43,8 +43,10 @@ struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size, size_t align);void drm_pci_free (struct drm_device *dev,struct drm_dma_handle * dmah); +#if IS_ENABLED (CONFIG_DRM_LEGACY )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); +#endif
I think would be prettier if you stuff this into drm_legacy.h and the code into drm_legacy_misc.c. Out of sight, out of mind and all that :-) With that:
Reviewed-by Daniel Vetter <[email protected]>
Quoted 10 lines
include/drm/drm_pci.h +0
-0#ifdef CONFIG_PCI int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel