summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ringbuffer.h
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-01-23 18:24:26 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2011-01-25 00:45:32 +0100
commitbdd92c9ad287e03a2ec52f5a89c470cd5caae1c2 (patch)
tree38d863507e900fb2ccac4c22fcf8934271c051b5 /drivers/gpu/drm/i915/intel_ringbuffer.h
parentdrm/i915: Remove unused code: i915_enable_interrupt() (diff)
parentdrm/i915: Prevent uninitialised reads during error state capture (diff)
downloadlinux-bdd92c9ad287e03a2ec52f5a89c470cd5caae1c2.tar.xz
linux-bdd92c9ad287e03a2ec52f5a89c470cd5caae1c2.zip
Merge branch 'drm-intel-fixes' into drm-intel-next
Merge important suspend and resume regression fixes and resolve the small conflict. Conflicts: drivers/gpu/drm/i915/i915_dma.c
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.h')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.h4
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 d5911aa06597..5e14b09f67ce 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 {
struct drm_device *dev;
struct drm_i915_gem_object *obj;
- u32 actual_head;
u32 head;
u32 tail;
int space;
@@ -187,4 +186,7 @@ int intel_init_blt_ring_buffer(struct drm_device *dev);
u32 intel_ring_get_active_head(struct intel_ring_buffer *ring);
void intel_ring_setup_status_page(struct intel_ring_buffer *ring);
+/* DRI warts */
+int intel_render_ring_init_dri(struct drm_device *dev, u64 start, u32 size);
+
#endif /* _INTEL_RINGBUFFER_H_ */