On Tue, Feb 25, 2020 at 05:58:35PM +0100, Daniel Vetter wrote: > Only user left is the shadow attach for legacy drivers. > > v2: Shift the #ifdef CONFIG_DRM_LEGACY to now also include > drm_get_pci_dev() (Thomas) > > Cc: Thomas Zimmermann <tzimmerm...@suse.de> > Cc: Emil Velikov <emil.veli...@collabora.com> > Cc: Alex Deucher <alexander.deuc...@amd.com> > Reviewed-by: Thomas Zimmermann <tzimmerm...@suse.de> > Reviewed-by: Emil Velikov <emil.veli...@collabora.com> > Signed-off-by: Daniel Vetter <daniel.vet...@intel.com>
Pushed to drm-misc-next now that the radeon/amdgpu patches have been backmerged. -Daniel > --- > drivers/gpu/drm/drm_pci.c | 26 +++++--------------------- > include/drm/drm_pci.h | 11 ----------- > 2 files changed, 5 insertions(+), 32 deletions(-) > > diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c > index c6bb98729a26..5218475ad7e7 100644 > --- a/drivers/gpu/drm/drm_pci.c > +++ b/drivers/gpu/drm/drm_pci.c > @@ -75,7 +75,6 @@ drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, > size_t size, size_t ali > > return dmah; > } > - > EXPORT_SYMBOL(drm_pci_alloc); > > /** > @@ -191,23 +190,11 @@ void drm_pci_agp_destroy(struct drm_device *dev) > } > } > > -/** > - * drm_get_pci_dev - Register a PCI device with the DRM subsystem > - * @pdev: PCI device > - * @ent: entry from the PCI ID table that matches @pdev > - * @driver: DRM device driver > - * > - * Attempt to gets inter module "drm" information. If we are first > - * then register the character device and inter module information. > - * Try and register, if we fail to register, backout previous work. > - * > - * NOTE: This function is deprecated, please use drm_dev_alloc() and > - * drm_dev_register() instead and remove your &drm_driver.load callback. > - * > - * Return: 0 on success or a negative error code on failure. > - */ > -int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent, > - struct drm_driver *driver) > +#ifdef CONFIG_DRM_LEGACY > + > +static int drm_get_pci_dev(struct pci_dev *pdev, > + const struct pci_device_id *ent, > + struct drm_driver *driver) > { > struct drm_device *dev; > int ret; > @@ -250,9 +237,6 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct > pci_device_id *ent, > drm_dev_put(dev); > return ret; > } > -EXPORT_SYMBOL(drm_get_pci_dev); > - > -#ifdef CONFIG_DRM_LEGACY > > /** > * drm_legacy_pci_init - shadow-attach a legacy DRM PCI driver > diff --git a/include/drm/drm_pci.h b/include/drm/drm_pci.h > index 9031e217b506..3941b0255ecf 100644 > --- a/include/drm/drm_pci.h > +++ b/include/drm/drm_pci.h > @@ -45,10 +45,6 @@ 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); > > -int drm_get_pci_dev(struct pci_dev *pdev, > - const struct pci_device_id *ent, > - struct drm_driver *driver); > - > #else > > static inline struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, > @@ -62,13 +58,6 @@ static inline void drm_pci_free(struct drm_device *dev, > { > } > > -static inline int drm_get_pci_dev(struct pci_dev *pdev, > - const struct pci_device_id *ent, > - struct drm_driver *driver) > -{ > - return -ENOSYS; > -} > - > #endif > > #endif /* _DRM_PCI_H_ */ > -- > 2.24.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel