diff options
| author | Dave Gordon | 2016-07-04 12:34:37 +0200 |
|---|---|---|
| committer | Chris Wilson | 2016-07-04 13:54:44 +0200 |
| commit | f19ec8cb5a4e16299840be6220308793d443de3f (patch) | |
| tree | af5eaff37a9e759ad957a6d795dcd3bca8811161 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Mass convert dev->dev_private to to_i915(dev) (diff) | |
| download | kernel-qcow2-linux-f19ec8cb5a4e16299840be6220308793d443de3f.tar.gz kernel-qcow2-linux-f19ec8cb5a4e16299840be6220308793d443de3f.tar.xz kernel-qcow2-linux-f19ec8cb5a4e16299840be6220308793d443de3f.zip | |
drm/i915: convert a few more E->dev_private to to_i915(E)
Also remove some redundant dev and dev_priv locals
Signed-off-by: Dave Gordon <david.s.gordon@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1467626365-29871-1-git-send-email-david.s.gordon@intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1467628477-25379-2-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 7a88840b59fa..a7852dd0a3d4 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4772,7 +4772,7 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj, obj->fence_reg = I915_FENCE_REG_NONE; obj->madv = I915_MADV_WILLNEED; - i915_gem_info_add_obj(obj->base.dev->dev_private, obj->base.size); + i915_gem_info_add_obj(to_i915(obj->base.dev), obj->base.size); } static const struct drm_i915_gem_object_ops i915_gem_object_ops = { @@ -5398,7 +5398,7 @@ int i915_gem_open(struct drm_device *dev, struct drm_file *file) return -ENOMEM; file->driver_priv = file_priv; - file_priv->dev_priv = dev->dev_private; + file_priv->dev_priv = to_i915(dev); file_priv->file = file; INIT_LIST_HEAD(&file_priv->rps.link); |