[PATCH 01/17] drm/i915: Move gen8 clear_range vfunc setup into common code

Daniel Vetter
2015-04-14T15:35:36Z

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 9041f3dfdfb4..1c8ef7c143aa 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -994,6 +994,7 @@ static int gen8_ppgtt_init_common(struct i915_hw_ppgtt *ppgtt, uint64_t size)
ppgtt->base.total = size;
ppgtt->base.cleanup = gen8_ppgtt_cleanup;
ppgtt->base.insert_entries = gen8_ppgtt_insert_entries;
+ ppgtt->base.clear_range = gen8_ppgtt_clear_range;

ppgtt->switch_mm = gen8_mm_switch;

@@ -1022,7 +1023,6 @@ static int gen8_aliasing_ppgtt_init(struct i915_hw_ppgtt *ppgtt)
}

ppgtt->base.allocate_va_range = NULL;
- ppgtt->base.clear_range = gen8_ppgtt_clear_range;
ppgtt->base.clear_range(&ppgtt->base, 0, ppgtt->base.total, true);

return 0;
@@ -1037,7 +1037,6 @@ static int gen8_ppgtt_init(struct i915_hw_ppgtt *ppgtt)
return ret;

ppgtt->base.allocate_va_range = gen8_alloc_va_range;
- ppgtt->base.clear_range = gen8_ppgtt_clear_range;

return 0;
}
--
2.1.0