diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-10-05 12:11:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-10-05 12:11:43 +1000 |
| commit | 19b7cc34443889fc73de2e10462e1c0f9fa38041 (patch) | |
| tree | 1cd73a2ef2aaed132cbc766e4ad4a8d2e3dde4e6 /shared-core/i915_drv.h | |
| parent | d351601899e5814d809b8e86ab6f0d6e7676f585 (diff) | |
| parent | 495bbbaadc93c574eb98dd2ad64bdca4d91d4152 (diff) | |
Merge branch 'pre-superioctl-branch'
Diffstat (limited to 'shared-core/i915_drv.h')
| -rw-r--r-- | shared-core/i915_drv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index 899817ec..3b26040f 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -214,7 +214,8 @@ extern int i915_fence_has_irq(struct drm_device *dev, uint32_t class, uint32_t f #ifdef I915_HAVE_BUFFER /* i915_buffer.c */ extern struct drm_ttm_backend *i915_create_ttm_backend_entry(struct drm_device *dev); -extern int i915_fence_types(struct drm_buffer_object *bo, uint32_t *type); +extern int i915_fence_types(struct drm_buffer_object *bo, uint32_t *fclass, + uint32_t *type); extern int i915_invalidate_caches(struct drm_device *dev, uint64_t buffer_flags); extern int i915_init_mem_type(struct drm_device *dev, uint32_t type, struct drm_mem_type_manager *man); |