diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
| commit | c64eae9a73a847c1698f913c893aa4012d2a30b0 (patch) | |
| tree | 732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /drivers/gpu/drm/i915/intel_ringbuffer.h | |
| parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into devicetree/next
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index be9087e4c9b..6d6fde85a63 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h | |||
| @@ -47,7 +47,6 @@ struct intel_ring_buffer { | |||
| 47 | struct drm_device *dev; | 47 | struct drm_device *dev; |
| 48 | struct drm_i915_gem_object *obj; | 48 | struct drm_i915_gem_object *obj; |
| 49 | 49 | ||
| 50 | u32 actual_head; | ||
| 51 | u32 head; | 50 | u32 head; |
| 52 | u32 tail; | 51 | u32 tail; |
| 53 | int space; | 52 | int space; |
| @@ -167,4 +166,7 @@ int intel_init_blt_ring_buffer(struct drm_device *dev); | |||
| 167 | u32 intel_ring_get_active_head(struct intel_ring_buffer *ring); | 166 | u32 intel_ring_get_active_head(struct intel_ring_buffer *ring); |
| 168 | void intel_ring_setup_status_page(struct intel_ring_buffer *ring); | 167 | void intel_ring_setup_status_page(struct intel_ring_buffer *ring); |
| 169 | 168 | ||
| 169 | /* DRI warts */ | ||
| 170 | int intel_render_ring_init_dri(struct drm_device *dev, u64 start, u32 size); | ||
| 171 | |||
| 170 | #endif /* _INTEL_RINGBUFFER_H_ */ | 172 | #endif /* _INTEL_RINGBUFFER_H_ */ |