diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-09 20:22:04 (GMT) |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-09 20:22:04 (GMT) |
| commit | 8d5203ca62539c6ab36a5bc2402c2de1de460e30 (patch) | |
| tree | dd0c5815cea7134904855bef8d81a9b31e45c06b /drivers/gpu/drm/i915/intel_ringbuffer.h | |
| parent | 8fd2685911cb6c140e6d0588ac04990ce65d4537 (diff) | |
| parent | 63abf3edaf42d0b9f278df90fe41c7ed4796b6b1 (diff) | |
| download | linux-fsl-qoriq-8d5203ca62539c6ab36a5bc2402c2de1de460e30.tar.xz | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 6a3822b..9652e46 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -44,8 +44,9 @@ struct intel_ring_buffer { struct drm_device *dev; struct drm_i915_gem_object *obj; - unsigned int head; - unsigned int tail; + u32 actual_head; + u32 head; + u32 tail; int space; int size; struct intel_hw_status_page status_page; |