drm: remove device_is_agp callback

With that the drm_pci_device_is_agp function becomes trivial, so
inline that too. And while at it, move the drm_pci_agp_destroy
declaration into drm-internal.h, since it's not used by drivers.

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170125062657.19270-11-daniel.vetter@ffwll.ch

diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
index a6213f8..f37388c 100644 (file)
--- a/drivers/gpu/drm/drm_internal.h
+++ b/drivers/gpu/drm/drm_internal.h
@@ -31,6 +31,7 @@ void drm_lastclose(struct drm_device *dev);
 /* drm_pci.c */
 int drm_irq_by_busid(struct drm_device *dev, void *data,
                     struct drm_file *file_priv);
+void drm_pci_agp_destroy(struct drm_device *dev);
 
 /* drm_prime.c */
 int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data,

diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index 60af894..a3b356e 100644 (file)
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -191,7 +191,7 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
 static void drm_pci_agp_init(struct drm_device *dev)
 {
        if (drm_core_check_feature(dev, DRIVER_USE_AGP)) {
-               if (drm_pci_device_is_agp(dev))
+               if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP))
                        dev->agp = drm_agp_init(dev);
                if (dev->agp) {
                        dev->agp->agp_mtrr = arch_phys_wc_add(

diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index 7bd4683..4df4f6e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -199,7 +199,7 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS)
                if (!nvxx_device(device)->func->pci)
                        getparam->value = 3;
                else
-               if (drm_pci_device_is_agp(dev))
+               if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP))
                        getparam->value = 0;
                else
                if (!pci_is_pcie(dev->pdev))

diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 510ea37..a8442f7 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -121,7 +121,8 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
                   VRAM, also but everything into VRAM on AGP cards and older
                   IGP chips to avoid image corruptions */
                if (p->ring == R600_RING_TYPE_UVD_INDEX &&
-                   (i == 0 || drm_pci_device_is_agp(p->rdev->ddev) ||
+                   (i == 0 || pci_find_capability(p->rdev->ddev->pdev,
+                                                  PCI_CAP_ID_AGP) ||
                     p->rdev->family == CHIP_RS780 ||
                     p->rdev->family == CHIP_RS880)) {
 

diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 116cf0d..56f35c0 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -105,7 +105,7 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
        dev->dev_private = (void *)rdev;
 
        /* update BUS flag */
-       if (drm_pci_device_is_agp(dev)) {
+       if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP)) {
                flags |= RADEON_IS_AGP;
        } else if (pci_is_pcie(dev->pdev)) {
                flags |= RADEON_IS_PCIE;

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index e5882d5..21a3a66 100644 (file)
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -790,21 +790,6 @@ extern void drm_sysfs_hotplug_event(struct drm_device *dev);
 
 /*@}*/
 
-/* PCI section */
-static __inline__ int drm_pci_device_is_agp(struct drm_device *dev)
-{
-       if (dev->driver->device_is_agp != NULL) {
-               int err = (*dev->driver->device_is_agp) (dev);
-
-               if (err != 2) {
-                       return err;
-               }
-       }
-
-       return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP);
-}
-void drm_pci_agp_destroy(struct drm_device *dev);
-
 extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver);
 extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver);
 #ifdef CONFIG_PCI

diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
index 5ab2459..af75fc6 100644 (file)
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
@@ -151,20 +151,6 @@ struct drm_driver {
        void (*disable_vblank) (struct drm_device *dev, unsigned int pipe);
 
        /**
-        * @device_is_agp:
-        *
-        * Called by drm_device_is_agp().  Typically used to determine if a card
-        * is really attached to AGP or not.
-        *
-        * Returns:
-        *
-        * One of three values is returned depending on whether or not the
-        * card is absolutely not AGP (return of 0), absolutely is AGP
-        * (return of 1), or may or may not be AGP (return of 2).
-        */
-       int (*device_is_agp) (struct drm_device *dev);
-
-       /**
         * @get_scanout_position:
         *
         * Called by vblank timestamping code.