Reorder the DRM_*_AGP enum to match linux's numbers (oops). Fixes i915

    attachment. Make our mga_drv.c use them, while I'm here.
Submitted by: Jonathan Fosburgh <jonathan@fosburgh.org>

diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h
index 43f2427..074e1d2 100644 (file)
--- a/bsd-core/drmP.h
+++ b/bsd-core/drmP.h
@@ -217,8 +217,8 @@ typedef void                        irqreturn_t;
 
 enum {
        DRM_IS_NOT_AGP,
-       DRM_MIGHT_BE_AGP,
-       DRM_IS_AGP
+       DRM_IS_AGP,
+       DRM_MIGHT_BE_AGP
 };
 #define DRM_AGP_MEM            struct agp_memory_info
 

diff --git a/bsd-core/mga_drv.c b/bsd-core/mga_drv.c
index 3d324fb..5dc7efe 100644 (file)
--- a/bsd-core/mga_drv.c
+++ b/bsd-core/mga_drv.c
@@ -79,9 +79,9 @@ static int mga_driver_device_is_agp(drm_device_t * dev)
        if (pci_get_device(dev->device) == 0x0525 &&
            pci_get_vendor(bus) == 0x3388 &&
            pci_get_device(bus) == 0x0021)
-               return 0;
+               return DRM_IS_NOT_AGP;
        else
-               return 2;
+               return DRM_MIGHT_BE_AGP;
 }
 
 static void mga_configure(drm_device_t *dev)