diff options
author | Dave Airlie <airlied@linux.ie> | 2007-07-16 10:05:20 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2007-07-16 10:05:20 +1000 |
commit | 2134193af6c29fcb83408b2878facd4b9cc4c4c8 (patch) | |
tree | 694a3fcf065653acd620909a3ecfdd6ac88c98ec /linux-core/i915_buffer.c | |
parent | bc7d6c76fab2ff4d2f11b6bd84ca8b8f124729fd (diff) | |
parent | 2c9e05cf4c6eb18c941321f764ed1b282a314ba9 (diff) |
Merge branch 'drm-ttm-cleanup-branch'
Diffstat (limited to 'linux-core/i915_buffer.c')
-rw-r--r-- | linux-core/i915_buffer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux-core/i915_buffer.c b/linux-core/i915_buffer.c index 8589f467..2850fb94 100644 --- a/linux-core/i915_buffer.c +++ b/linux-core/i915_buffer.c @@ -38,9 +38,8 @@ drm_ttm_backend_t *i915_create_ttm_backend_entry(drm_device_t * dev) return drm_agp_init_ttm(dev); } -int i915_fence_types(drm_buffer_object_t *bo, uint32_t * class, uint32_t * type) +int i915_fence_types(drm_buffer_object_t *bo, uint32_t * type) { - *class = 0; if (bo->mem.flags & (DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE)) *type = 3; else @@ -48,7 +47,7 @@ int i915_fence_types(drm_buffer_object_t *bo, uint32_t * class, uint32_t * type) return 0; } -int i915_invalidate_caches(drm_device_t * dev, uint32_t flags) +int i915_invalidate_caches(drm_device_t * dev, uint64_t flags) { /* * FIXME: Only emit once per batchbuffer submission. |