drm/i915: Switch to bitmap_zalloc() (6e514e37) · Commits · 戴 / test

drivers/gpu/drm/i915/i915_gem.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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));

+1 −2

Original line number	Diff line number	Diff line
		@@ -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");

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

+2 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}