Don't enable fence / buffer objects on non-linux systems.

Bump driver minor and date.

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index 1718bb3..0a0e5f9 100644 (file)
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -38,6 +38,7 @@ static struct pci_device_id pciidlist[] = {
        i915_PCI_IDS
 };
 
+#ifdef I915_HAVE_FENCE
 static drm_fence_driver_t i915_fence_driver = {
        .no_types = 2,
        .wrap_diff = (1 << 30),
@@ -47,7 +48,8 @@ static drm_fence_driver_t i915_fence_driver = {
        .emit = i915_fence_emit_sequence,
        .poke_flush = i915_poke_flush,
 };
-
+#endif
+#ifdef I915_HAVE_BUFFER
 static drm_bo_driver_t i915_bo_driver = {
         .vram_map = NULL,
        .cached_vram = 0,
@@ -56,7 +58,7 @@ static drm_bo_driver_t i915_bo_driver = {
        .fence_type = i915_fence_types,
        .invalidate_caches = i915_invalidate_caches
 };
-
+#endif
 
 static int probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 static struct drm_driver driver = {
@@ -97,10 +99,12 @@ static struct drm_driver driver = {
                .probe = probe,
                .remove = __devexit_p(drm_cleanup_pci),
                },
-
+#ifdef I915_HAVE_FENCE
        .fence_driver = &i915_fence_driver,
+#endif
+#ifdef I915_HAVE_BUFFER
        .bo_driver = &i915_bo_driver,
-
+#endif
        .name = DRIVER_NAME,
        .desc = DRIVER_DESC,
        .date = DRIVER_DATE,

diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index 402ad5b..745377c 100644 (file)
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -35,9 +35,9 @@
 
 #define DRIVER_AUTHOR          "Tungsten Graphics, Inc."
 
-#define DRIVER_NAME            "i915"
+#define DRIVER_NAME            "i915-mm"
 #define DRIVER_DESC            "Intel Graphics"
-#define DRIVER_DATE            "20060119"
+#define DRIVER_DATE            "20060923"
 
 /* Interface history:
  *
@@ -48,7 +48,7 @@
  * 1.5: Add vblank pipe configuration
  */
 #define DRIVER_MAJOR           1
-#define DRIVER_MINOR           5
+#define DRIVER_MINOR           6
 #define DRIVER_PATCHLEVEL      0
 
 #if defined(__linux__)