Small rename to make things consistent with naming for gen6.
Let's also remove redundant start_in/length_in vars in gen6 path.
Cc: Arkadiusz Hiler <arkadiusz.hi...@intel.com>
Cc: Chris Wilson <ch...@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahti...@linux.intel.com>
Cc: Michel Thierry <michel.thie...@intel.com>
Cc: Mika Kuoppala <mika.kuopp...@intel.com>
Signed-off-by: Michał Winiarski <michal.winiar...@intel.com>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c
b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 11ec68c..49e1006 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -1297,8 +1297,8 @@ static int gen8_alloc_va_range_3lvl(struct
i915_address_space *vm,
unsigned long *new_page_dirs, *new_page_tables;
struct drm_i915_private *dev_priv = vm->i915;
struct i915_page_directory *pd;
- const uint64_t orig_start = start;
- const uint64_t orig_length = length;
+ const uint64_t start_save = start;
+ const uint64_t length_save = length;
uint32_t pdpe;
uint32_t pdpes = I915_PDPES_PER_PDP(dev_priv);
int ret;
@@ -1332,8 +1332,8 @@ static int gen8_alloc_va_range_3lvl(struct
i915_address_space *vm,
goto err_out;
}
- start = orig_start;
- length = orig_length;
+ start = start_save;
+ length = length_save;
/* Allocations have completed successfully, so set the bitmaps, and do
* the mappings. */
@@ -1918,22 +1918,22 @@ static void gen6_ppgtt_insert_entries(struct
i915_address_space *vm,
}
static int gen6_alloc_va_range(struct i915_address_space *vm,
- uint64_t start_in, uint64_t length_in)
+ uint64_t start, uint64_t length)
{
DECLARE_BITMAP(new_page_tables, I915_PDES);
struct drm_i915_private *dev_priv = vm->i915;
struct i915_ggtt *ggtt = &dev_priv->ggtt;
struct i915_hw_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);
struct i915_page_table *pt;
- uint32_t start, length, start_save, length_save;
+ uint32_t start_save, length_save;
uint32_t pde;
int ret;
- if (WARN_ON(start_in + length_in > ppgtt->base.total))
+ if (WARN_ON(start + length > ppgtt->base.total))
return -ENODEV;
- start = start_save = start_in;
- length = length_save = length_in;
+ start_save = start;
+ length_save = length;
bitmap_zero(new_page_tables, I915_PDES);
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
