diff options
| author | Eric Anholt <eric@anholt.net> | 2010-05-21 13:55:54 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-05-26 12:36:00 -0700 |
| commit | d3301d86b4bf2bcf649982ae464211d8bcf9575a (patch) | |
| tree | e3334543a973874297421d57a63f8c452ae76455 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | 62fdfeaf8b1f487060b6e160e7b5cd90287607c9 (diff) | |
| download | talos-op-linux-d3301d86b4bf2bcf649982ae464211d8bcf9575a.tar.gz talos-op-linux-d3301d86b4bf2bcf649982ae464211d8bcf9575a.zip | |
drm/i915: Rename dev_priv->ring to dev_priv->render_ring.
With the advent of the BSD ring, be clear about which ring this is.
The docs are pretty consistent with calling this the Render engine at
this point.
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 5c51e45ab68d..a1814f65fdb4 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -389,7 +389,7 @@ int i965_reset(struct drm_device *dev, u8 flags) */ if (drm_core_check_feature(dev, DRIVER_MODESET) || !dev_priv->mm.suspended) { - drm_i915_ring_buffer_t *ring = &dev_priv->ring; + drm_i915_ring_buffer_t *ring = &dev_priv->render_ring; struct drm_gem_object *obj = ring->ring_obj; struct drm_i915_gem_object *obj_priv = to_intel_bo(obj); dev_priv->mm.suspended = 0; |
