drm: rip out drm_core_has_AGP

Most place actually want to just check for dev->agp (most do, but a
few don't so this fixes a few potential NULL derefs). The only
exception is the agp init code which should check for the AGP driver
feature flag.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 2 insertions, 2 deletions

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