diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-08 14:18:58 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-23 15:19:10 -0500 |
commit | 05394f3975dceb107a5e1393e2244946e5b43660 (patch) | |
tree | 2af73b6efec503ed4cd9c932018619bd28a1fe60 /drivers/gpu/drm/i915/intel_ringbuffer.h | |
parent | 185cbcb304ba4dee55e39593fd86dcd7813f62ec (diff) |
drm/i915: Use drm_i915_gem_object as the preferred type
A glorified s/obj_priv/obj/ with a net reduction of over a 100 lines and
many characters!
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 2565d65a625..1747e329ee9 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h | |||
@@ -4,7 +4,7 @@ | |||
4 | struct intel_hw_status_page { | 4 | struct intel_hw_status_page { |
5 | u32 __iomem *page_addr; | 5 | u32 __iomem *page_addr; |
6 | unsigned int gfx_addr; | 6 | unsigned int gfx_addr; |
7 | struct drm_gem_object *obj; | 7 | struct drm_i915_gem_object *obj; |
8 | }; | 8 | }; |
9 | 9 | ||
10 | #define I915_RING_READ(reg) i915_safe_read(dev_priv, reg) | 10 | #define I915_RING_READ(reg) i915_safe_read(dev_priv, reg) |
@@ -32,7 +32,7 @@ struct intel_ring_buffer { | |||
32 | u32 mmio_base; | 32 | u32 mmio_base; |
33 | void *virtual_start; | 33 | void *virtual_start; |
34 | struct drm_device *dev; | 34 | struct drm_device *dev; |
35 | struct drm_gem_object *gem_object; | 35 | struct drm_i915_gem_object *obj; |
36 | 36 | ||
37 | unsigned int head; | 37 | unsigned int head; |
38 | unsigned int tail; | 38 | unsigned int tail; |