diff options
| author | Tvrtko Ursulin | 2016-11-16 09:55:33 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin | 2016-11-17 14:56:06 +0100 |
| commit | 4362f4f6dd58b0e2d782d78efd49769dea650010 (patch) | |
| tree | 42556403c658331d413623e264fe393fc62a7a5b /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Use dev_priv in INTEL_INFO in i915_gem_execbuffer.c (diff) | |
| download | kernel-qcow2-linux-4362f4f6dd58b0e2d782d78efd49769dea650010.tar.gz kernel-qcow2-linux-4362f4f6dd58b0e2d782d78efd49769dea650010.tar.xz kernel-qcow2-linux-4362f4f6dd58b0e2d782d78efd49769dea650010.zip | |
drm/i915: Use dev_priv in INTEL_INFO in i915_gem_fence_reg.c
Plus a small cascade of function prototype changes.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <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 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index d7681fe0c0f8..c3b2fa4e5cdb 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2750,7 +2750,7 @@ void i915_gem_reset(struct drm_i915_private *dev_priv) for_each_engine(engine, dev_priv, id) i915_gem_reset_engine(engine); - i915_gem_restore_fences(&dev_priv->drm); + i915_gem_restore_fences(dev_priv); if (dev_priv->gt.awake) { intel_sanitize_gt_powersave(dev_priv); @@ -4448,7 +4448,6 @@ i915_gem_cleanup_engines(struct drm_device *dev) void i915_gem_load_init_fences(struct drm_i915_private *dev_priv) { - struct drm_device *dev = &dev_priv->drm; int i; if (INTEL_INFO(dev_priv)->gen >= 7 && !IS_VALLEYVIEW(dev_priv) && @@ -4472,9 +4471,9 @@ i915_gem_load_init_fences(struct drm_i915_private *dev_priv) fence->id = i; list_add_tail(&fence->link, &dev_priv->mm.fence_list); } - i915_gem_restore_fences(dev); + i915_gem_restore_fences(dev_priv); - i915_gem_detect_bit_6_swizzle(dev); + i915_gem_detect_bit_6_swizzle(dev_priv); } int |