diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-19 17:00:31 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-19 17:00:31 +0800 |
| commit | 8398b99d8d146278adc13d6093811e53cd42c88a (patch) | |
| tree | 9da61388447defcfec68d7294989f6dc501d39ed /shared-core | |
| parent | df73975980e926e350bf36bf4bc8a07220f66164 (diff) | |
| parent | 1e77e52755c9bb94c9230778845e6701b4d82b3a (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/drm.h | 6 | ||||
| -rw-r--r-- | shared-core/i915_drv.h | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h index bcb3eedf..3c59cd40 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -798,7 +798,7 @@ typedef enum { drm_bo_type_user, drm_bo_type_fake }drm_bo_type_t; - + typedef struct drm_bo_arg_request { unsigned handle; /* User space handle */ @@ -846,10 +846,10 @@ typedef struct drm_bo_arg_reply { unsigned page_alignment; unsigned expand_pad[4]; /*Future expansion */ }drm_bo_arg_reply_t; - + typedef struct drm_bo_arg{ - int handled; + int handled; drm_u64_t next; union { drm_bo_arg_request_t req; diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index a3736160..662ffad6 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -112,14 +112,14 @@ typedef struct drm_i915_private { struct mem_block *agp_heap; unsigned int sr01, adpa, ppcr, dvob, dvoc, lvds; int vblank_pipe; - spinlock_t user_irq_lock; - int user_irq_refcount; - int fence_irq_on; - uint32_t irq_enable_reg; - int irq_enabled; + spinlock_t user_irq_lock; + int user_irq_refcount; + int fence_irq_on; + uint32_t irq_enable_reg; + int irq_enabled; #ifdef I915_HAVE_FENCE - uint32_t flush_sequence; + uint32_t flush_sequence; uint32_t flush_flags; uint32_t flush_pending; uint32_t saved_flush_status; |