mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-20 13:08:01 +07:00
drm/i915: Switch to bitmap_zalloc()
Switch to bitmap_zalloc() to show clearly what we are allocating. Besides that it returns pointer of bitmap type instead of opaque void *. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20190304092908.57382-2-andriy.shevchenko@linux.intel.com
This commit is contained in:
parent
8cac9fd9bc
commit
6e514e3717
@ -4195,7 +4195,7 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915,
|
||||
drm_gem_object_release(&obj->base);
|
||||
i915_gem_info_remove_obj(i915, obj->base.size);
|
||||
|
||||
kfree(obj->bit_17);
|
||||
bitmap_free(obj->bit_17);
|
||||
i915_gem_object_free(obj);
|
||||
|
||||
GEM_BUG_ON(!atomic_read(&i915->mm.free_count));
|
||||
|
@ -765,8 +765,7 @@ i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj,
|
||||
int i;
|
||||
|
||||
if (obj->bit_17 == NULL) {
|
||||
obj->bit_17 = kcalloc(BITS_TO_LONGS(page_count),
|
||||
sizeof(long), GFP_KERNEL);
|
||||
obj->bit_17 = bitmap_zalloc(page_count, GFP_KERNEL);
|
||||
if (obj->bit_17 == NULL) {
|
||||
DRM_ERROR("Failed to allocate memory for bit 17 "
|
||||
"record\n");
|
||||
|
@ -301,11 +301,11 @@ i915_gem_object_set_tiling(struct drm_i915_gem_object *obj,
|
||||
/* Try to preallocate memory required to save swizzling on put-pages */
|
||||
if (i915_gem_object_needs_bit17_swizzle(obj)) {
|
||||
if (!obj->bit_17) {
|
||||
obj->bit_17 = kcalloc(BITS_TO_LONGS(obj->base.size >> PAGE_SHIFT),
|
||||
sizeof(long), GFP_KERNEL);
|
||||
obj->bit_17 = bitmap_zalloc(obj->base.size >> PAGE_SHIFT,
|
||||
GFP_KERNEL);
|
||||
}
|
||||
} else {
|
||||
kfree(obj->bit_17);
|
||||
bitmap_free(obj->bit_17);
|
||||
obj->bit_17 = NULL;
|
||||
}
|
||||
|
||||
|
@ -258,8 +258,7 @@ static int live_forcewake_domains(void *arg)
|
||||
if (!IS_ENABLED(CONFIG_DRM_I915_SELFTEST_BROKEN))
|
||||
return 0;
|
||||
|
||||
valid = kcalloc(BITS_TO_LONGS(FW_RANGE), sizeof(*valid),
|
||||
GFP_KERNEL);
|
||||
valid = bitmap_zalloc(FW_RANGE, GFP_KERNEL);
|
||||
if (!valid)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -294,7 +293,7 @@ static int live_forcewake_domains(void *arg)
|
||||
}
|
||||
}
|
||||
|
||||
kfree(valid);
|
||||
bitmap_free(valid);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user