6 files changed, 11 insertions, 14 deletions

diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c
index e301d653d97e..084a674e4b56 100644
--- a/drivers/gpu/drm/drm_agpsupport.c
+++ b/drivers/gpu/drm/drm_agpsupport.c
@@ -439,7 +439,7 @@ void drm_agp_clear(struct drm_device *dev)
 {
         struct drm_agp_mem *entry, *tempe;
 
-        if (!drm_core_has_AGP(dev) || !dev->agp)
+        if (!dev->agp)
                 return;
         if (drm_core_check_feature(dev, DRIVER_MODESET))
                 return;
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 766a5474fdbd..edec31fe3fed 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -261,7 +261,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
                 struct drm_agp_mem *entry;
                 int valid = 0;
 
-                if (!drm_core_has_AGP(dev)) {
+                if (!dev->agp) {
                         kfree(map);
                         return -EINVAL;
                 }
@@ -1390,7 +1390,7 @@ int drm_mapbufs(struct drm_device *dev, void *data,
         spin_unlock(&dev->count_lock);
 
         if (request->count >= dma->buf_count) {
-                if ((drm_core_has_AGP(dev) && (dma->flags & _DRM_DMA_USE_AGP))
+                if ((dev->agp && (dma->flags & _DRM_DMA_USE_AGP))
                     || (drm_core_check_feature(dev, DRIVER_SG)
                         && (dma->flags & _DRM_DMA_USE_SG))) {
                         struct drm_local_map *map = dev->agp_buffer_map;
diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c
index 64e44fad8ae8..3359bc453e11 100644
--- a/drivers/gpu/drm/drm_memory.c
+++ b/drivers/gpu/drm/drm_memory.c
@@ -110,8 +110,7 @@ static inline void *agp_remap(unsigned long offset, unsigned long size,
 
 void drm_core_ioremap(struct drm_local_map *map, struct drm_device *dev)
 {
-        if (drm_core_has_AGP(dev) &&
-            dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP)
+        if (dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP)
                 map->handle = agp_remap(map->offset, map->size, dev);
         else
                 map->handle = ioremap(map->offset, map->size);
@@ -120,8 +119,7 @@ EXPORT_SYMBOL(drm_core_ioremap);
 
 void drm_core_ioremap_wc(struct drm_local_map *map, struct drm_device *dev)
 {
-        if (drm_core_has_AGP(dev) &&
-            dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP)
+        if (dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP)
                 map->handle = agp_remap(map->offset, map->size, dev);
         else
                 map->handle = ioremap_wc(map->offset, map->size);
@@ -133,8 +131,7 @@ void drm_core_ioremapfree(struct drm_local_map *map, struct drm_device *dev)
         if (!map->handle || !map->size)
                 return;
 
-        if (drm_core_has_AGP(dev) &&
-            dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP)
+        if (dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP)
                 vunmap(map->handle);
         else
                 iounmap(map->handle);
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index d3875e3f9d9c..626e9cfd8aa5 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -264,7 +264,7 @@ static int drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p)
 
 static void drm_pci_agp_init(struct drm_device *dev)
 {
-        if (drm_core_has_AGP(dev)) {
+        if (drm_core_check_feature(dev, DRIVER_USE_AGP)) {
                 if (drm_pci_device_is_agp(dev))
                         dev->agp = drm_agp_init(dev);
                 if (dev->agp) {
@@ -278,7 +278,7 @@ static void drm_pci_agp_init(struct drm_device *dev)
 
 static void drm_pci_agp_destroy(struct drm_device *dev)
 {
-        if (drm_core_has_AGP(dev) && dev->agp) {
+        if (dev->agp) {
                 arch_phys_wc_del(dev->agp->agp_mtrr);
                 drm_agp_clear(dev);
                 drm_agp_destroy(dev->agp);
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index 79873bb2923f..ef5540b6b451 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -101,7 +101,7 @@ static int drm_do_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         /*
          * Find the right map
          */
-        if (!drm_core_has_AGP(dev))
+        if (!dev->agp)
                 goto vm_fault_error;
 
         if (!dev->agp || !dev->agp->cant_use_aperture)
@@ -592,7 +592,7 @@ int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
         switch (map->type) {
 #if !defined(__arm__)
         case _DRM_AGP:
-                if (drm_core_has_AGP(dev) && dev->agp->cant_use_aperture) {
+                if (dev->agp && dev->agp->cant_use_aperture) {
                         /*
                          * On some platforms we can't talk to bus dma address from the CPU, so for
                          * memory of type DRM_AGP, we'll deal with sorting out the real physical
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 71245d6f34a2..051fa874065a 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -142,7 +142,7 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
                 man->flags = TTM_MEMTYPE_FLAG_MAPPABLE | TTM_MEMTYPE_FLAG_CMA;
 #if __OS_HAS_AGP
                 if (rdev->flags & RADEON_IS_AGP) {
-                        if (!(drm_core_has_AGP(rdev->ddev) && rdev->ddev->agp)) {
+                        if (!rdev->ddev->agp) {
                                 DRM_ERROR("AGP is not enabled for memory type %u\n",
                                           (unsigned)type);
                                 return -EINVAL;