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_gem.c | |
| parent | 62fdfeaf8b1f487060b6e160e7b5cd90287607c9 (diff) | |
| download | blackbird-op-linux-d3301d86b4bf2bcf649982ae464211d8bcf9575a.tar.gz blackbird-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_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 4f2f5f8cdca2..95dbe5628a25 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4378,7 +4378,7 @@ i915_gem_idle(struct drm_device *dev) mutex_lock(&dev->struct_mutex); - if (dev_priv->mm.suspended || dev_priv->ring.ring_obj == NULL) { + if (dev_priv->mm.suspended || dev_priv->render_ring.ring_obj == NULL) { mutex_unlock(&dev->struct_mutex); return 0; } |
