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 | |
| parent | d351601899e5814d809b8e86ab6f0d6e7676f585 (diff) | |
| parent | 495bbbaadc93c574eb98dd2ad64bdca4d91d4152 (diff) | |
Merge branch 'pre-superioctl-branch'
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/drm.h | 5 | ||||
| -rw-r--r-- | shared-core/i915_drv.h | 3 | ||||
| -rw-r--r-- | shared-core/via_drv.h | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h index b4754ead..19292344 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -639,6 +639,7 @@ struct drm_set_version { #define DRM_FENCE_FLAG_SHAREABLE 0x00000002 #define DRM_FENCE_FLAG_WAIT_LAZY 0x00000004 #define DRM_FENCE_FLAG_WAIT_IGNORE_SIGNALS 0x00000008 +#define DRM_FENCE_FLAG_NO_USER 0x00000010 /* Reserved for driver use */ #define DRM_FENCE_MASK_DRIVER 0xFF000000 @@ -651,8 +652,10 @@ struct drm_fence_arg { unsigned int type; unsigned int flags; unsigned int signaled; + unsigned int error; unsigned int sequence; - uint64_t expand_pad[3]; /*Future expansion */ + unsigned int pad64; + uint64_t expand_pad[2]; /*Future expansion */ }; /* Buffer permissions, referring to how the GPU uses the buffers. 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); diff --git a/shared-core/via_drv.h b/shared-core/via_drv.h index 15e65950..0b474844 100644 --- a/shared-core/via_drv.h +++ b/shared-core/via_drv.h @@ -206,7 +206,8 @@ extern int via_fence_has_irq(struct drm_device * dev, uint32_t class, #ifdef VIA_HAVE_BUFFER extern struct drm_ttm_backend *via_create_ttm_backend_entry(struct drm_device *dev); -extern int via_fence_types(struct drm_buffer_object *bo, uint32_t *type); +extern int via_fence_types(struct drm_buffer_object *bo, uint32_t *fclass, + uint32_t *type); extern int via_invalidate_caches(struct drm_device *dev, uint64_t buffer_flags); extern int via_init_mem_type(struct drm_device *dev, uint32_t type, struct drm_mem_type_manager *man); |