summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-09-28 11:33:03 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-09-28 11:33:03 +0200
commitc52fafa6288b4e6ecfce27151969749113a41f0b (patch)
tree9e9d8bedff7c854294fe99870241d6f184c7846a /linux-core
parent1c6f0ea43c47603c2265248ce8a91698c8982f3c (diff)
Don't enable fence / buffer objects on non-linux systems.
Bump driver minor and date.
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/i915_drv.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index 1718bb31..0a0e5f99 100644
--- 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,