tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm: Remove drm_driver->set_busid hook

The only special-case is pci devices, and we can easily handle this in
the core. Do so and drop a pile of boilerplate from drivers.

Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170524145212.27837-5-daniel.vetter@ffwll.ch

Daniel Vetter 5c484cee 76bba2cd

+3 -31
-1
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
··· 734 734 .open = amdgpu_driver_open_kms, 735 735 .postclose = amdgpu_driver_postclose_kms, 736 736 .lastclose = amdgpu_driver_lastclose_kms, 737 - .set_busid = drm_pci_set_busid, 738 737 .unload = amdgpu_driver_unload_kms, 739 738 .get_vblank_counter = amdgpu_get_vblank_counter_kms, 740 739 .enable_vblank = amdgpu_enable_vblank_kms,
-1
drivers/gpu/drm/ast/ast_drv.c
··· 197 197 198 198 .load = ast_driver_load, 199 199 .unload = ast_driver_unload, 200 - .set_busid = drm_pci_set_busid, 201 200 202 201 .fops = &ast_fops, 203 202 .name = DRIVER_NAME,
-1
drivers/gpu/drm/bochs/bochs_drv.c
··· 84 84 .driver_features = DRIVER_GEM | DRIVER_MODESET, 85 85 .load = bochs_load, 86 86 .unload = bochs_unload, 87 - .set_busid = drm_pci_set_busid, 88 87 .fops = &bochs_fops, 89 88 .name = "bochs-drm", 90 89 .desc = "bochs dispi vga interface (qemu stdvga)",
-1
drivers/gpu/drm/cirrus/cirrus_drv.c
··· 132 132 .driver_features = DRIVER_MODESET | DRIVER_GEM, 133 133 .load = cirrus_driver_load, 134 134 .unload = cirrus_driver_unload, 135 - .set_busid = drm_pci_set_busid, 136 135 .fops = &cirrus_driver_fops, 137 136 .name = DRIVER_NAME, 138 137 .desc = DRIVER_DESC,
+1
drivers/gpu/drm/drm_internal.h
··· 32 32 int drm_irq_by_busid(struct drm_device *dev, void *data, 33 33 struct drm_file *file_priv); 34 34 void drm_pci_agp_destroy(struct drm_device *dev); 35 + int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master); 35 36 36 37 /* drm_prime.c */ 37 38 int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data,
+2 -2
drivers/gpu/drm/drm_ioctl.c
··· 143 143 if (master->unique != NULL) 144 144 drm_unset_busid(dev, master); 145 145 146 - if (dev->driver->set_busid) { 147 - ret = dev->driver->set_busid(dev, master); 146 + if (dev_is_pci(dev->dev)) { 147 + ret = drm_pci_set_busid(dev, master); 148 148 if (ret) { 149 149 drm_unset_busid(dev, master); 150 150 return ret;
-1
drivers/gpu/drm/drm_pci.c
··· 149 149 master->unique_len = strlen(master->unique); 150 150 return 0; 151 151 } 152 - EXPORT_SYMBOL(drm_pci_set_busid); 153 152 154 153 static int drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p) 155 154 {
-1
drivers/gpu/drm/gma500/psb_drv.c
··· 480 480 .load = psb_driver_load, 481 481 .unload = psb_driver_unload, 482 482 .lastclose = psb_driver_lastclose, 483 - .set_busid = drm_pci_set_busid, 484 483 485 484 .num_ioctls = ARRAY_SIZE(psb_ioctls), 486 485 .irq_preinstall = psb_irq_preinstall,
-1
drivers/gpu/drm/i810/i810_drv.c
··· 59 59 .load = i810_driver_load, 60 60 .lastclose = i810_driver_lastclose, 61 61 .preclose = i810_driver_preclose, 62 - .set_busid = drm_pci_set_busid, 63 62 .dma_quiescent = i810_driver_dma_quiescent, 64 63 .ioctls = i810_ioctls, 65 64 .fops = &i810_driver_fops,
-1
drivers/gpu/drm/i915/i915_drv.c
··· 2622 2622 .open = i915_driver_open, 2623 2623 .lastclose = i915_driver_lastclose, 2624 2624 .postclose = i915_driver_postclose, 2625 - .set_busid = drm_pci_set_busid, 2626 2625 2627 2626 .gem_close_object = i915_gem_close_object, 2628 2627 .gem_free_object_unlocked = i915_gem_free_object,
-1
drivers/gpu/drm/mga/mga_drv.c
··· 62 62 .load = mga_driver_load, 63 63 .unload = mga_driver_unload, 64 64 .lastclose = mga_driver_lastclose, 65 - .set_busid = drm_pci_set_busid, 66 65 .dma_quiescent = mga_driver_dma_quiescent, 67 66 .get_vblank_counter = mga_get_vblank_counter, 68 67 .enable_vblank = mga_enable_vblank,
-1
drivers/gpu/drm/mgag200/mgag200_drv.c
··· 91 91 .driver_features = DRIVER_GEM | DRIVER_MODESET, 92 92 .load = mgag200_driver_load, 93 93 .unload = mgag200_driver_unload, 94 - .set_busid = drm_pci_set_busid, 95 94 .fops = &mgag200_driver_fops, 96 95 .name = DRIVER_NAME, 97 96 .desc = DRIVER_DESC,
-1
drivers/gpu/drm/nouveau/nouveau_drm.c
··· 1102 1102 nouveau_drm_init(void) 1103 1103 { 1104 1104 driver_pci = driver_stub; 1105 - driver_pci.set_busid = drm_pci_set_busid; 1106 1105 driver_platform = driver_stub; 1107 1106 1108 1107 nouveau_display_options();
-2
drivers/gpu/drm/qxl/qxl_drv.c
··· 262 262 DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | 263 263 DRIVER_ATOMIC, 264 264 265 - .set_busid = drm_pci_set_busid, 266 - 267 265 .dumb_create = qxl_mode_dumb_create, 268 266 .dumb_map_offset = qxl_mode_dumb_mmap, 269 267 .dumb_destroy = drm_gem_dumb_destroy,
-1
drivers/gpu/drm/r128/r128_drv.c
··· 62 62 .load = r128_driver_load, 63 63 .preclose = r128_driver_preclose, 64 64 .lastclose = r128_driver_lastclose, 65 - .set_busid = drm_pci_set_busid, 66 65 .get_vblank_counter = r128_get_vblank_counter, 67 66 .enable_vblank = r128_enable_vblank, 68 67 .disable_vblank = r128_disable_vblank,
-1
drivers/gpu/drm/radeon/radeon_drv.c
··· 545 545 .open = radeon_driver_open_kms, 546 546 .postclose = radeon_driver_postclose_kms, 547 547 .lastclose = radeon_driver_lastclose_kms, 548 - .set_busid = drm_pci_set_busid, 549 548 .unload = radeon_driver_unload_kms, 550 549 .get_vblank_counter = radeon_get_vblank_counter_kms, 551 550 .enable_vblank = radeon_enable_vblank_kms,
-1
drivers/gpu/drm/savage/savage_drv.c
··· 55 55 .preclose = savage_reclaim_buffers, 56 56 .lastclose = savage_driver_lastclose, 57 57 .unload = savage_driver_unload, 58 - .set_busid = drm_pci_set_busid, 59 58 .ioctls = savage_ioctls, 60 59 .dma_ioctl = savage_bci_buffers, 61 60 .fops = &savage_driver_fops,
-1
drivers/gpu/drm/sis/sis_drv.c
··· 104 104 .open = sis_driver_open, 105 105 .preclose = sis_reclaim_buffers_locked, 106 106 .postclose = sis_driver_postclose, 107 - .set_busid = drm_pci_set_busid, 108 107 .dma_quiescent = sis_idle, 109 108 .lastclose = sis_lastclose, 110 109 .ioctls = sis_ioctls,
-1
drivers/gpu/drm/tdfx/tdfx_drv.c
··· 55 55 56 56 static struct drm_driver driver = { 57 57 .driver_features = DRIVER_LEGACY, 58 - .set_busid = drm_pci_set_busid, 59 58 .fops = &tdfx_driver_fops, 60 59 .name = DRIVER_NAME, 61 60 .desc = DRIVER_DESC,
-1
drivers/gpu/drm/via/via_drv.c
··· 77 77 .open = via_driver_open, 78 78 .preclose = via_reclaim_buffers_locked, 79 79 .postclose = via_driver_postclose, 80 - .set_busid = drm_pci_set_busid, 81 80 .context_dtor = via_final_context, 82 81 .get_vblank_counter = via_get_vblank_counter, 83 82 .enable_vblank = via_enable_vblank,
-1
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
··· 1531 1531 .master_drop = vmw_master_drop, 1532 1532 .open = vmw_driver_open, 1533 1533 .postclose = vmw_postclose, 1534 - .set_busid = drm_pci_set_busid, 1535 1534 1536 1535 .dumb_create = vmw_dumb_create, 1537 1536 .dumb_map_offset = vmw_dumb_map_offset,
-2
include/drm/drm_drv.h
··· 172 172 */ 173 173 void (*release) (struct drm_device *); 174 174 175 - int (*set_busid)(struct drm_device *dev, struct drm_master *master); 176 - 177 175 /** 178 176 * @get_vblank_counter: 179 177 *
-7
include/drm/drm_pci.h
··· 49 49 int drm_get_pci_dev(struct pci_dev *pdev, 50 50 const struct pci_device_id *ent, 51 51 struct drm_driver *driver); 52 - int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master); 53 52 #else 54 53 static inline int drm_get_pci_dev(struct pci_dev *pdev, 55 54 const struct pci_device_id *ent, 56 55 struct drm_driver *driver) 57 - { 58 - return -ENOSYS; 59 - } 60 - 61 - static inline int drm_pci_set_busid(struct drm_device *dev, 62 - struct drm_master *master) 63 56 { 64 57 return -ENOSYS; 65 58 }