Commit db3307a9 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: kill drm_mm_node->private 



Only ever assigned, never used.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
[glisse: I will re-add if needed for range-restricted allocations]
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 26f3751e

drivers/gpu/drm/i915/i915_gem.c

+1 −3
Original line number Diff line number Diff line
@@ -2633,11 +2633,9 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) 
	if (free_space != NULL) {

		obj_priv->gtt_space = drm_mm_get_block(free_space, obj->size,

						       alignment);

		if (obj_priv->gtt_space != NULL) {

			obj_priv->gtt_space->private = obj;

		if (obj_priv->gtt_space != NULL)

			obj_priv->gtt_offset = obj_priv->gtt_space->start;

	}

	}

	if (obj_priv->gtt_space == NULL) {

		/* If the gtt is empty and we're still having trouble

		 * fitting our object in, we're out of memory.

drivers/gpu/drm/ttm/ttm_bo.c

+0 −6
Original line number Diff line number Diff line
@@ -476,7 +476,6 @@ static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo, bool remove_all) 
			++put_count;

		}

		if (bo->mem.mm_node) {

			bo->mem.mm_node->private = NULL;

			drm_mm_put_block(bo->mem.mm_node);

			bo->mem.mm_node = NULL;

		}
@@ -670,7 +669,6 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, bool interruptible, 
			printk(KERN_ERR TTM_PFX "Buffer eviction failed\n");

		spin_lock(&glob->lru_lock);

		if (evict_mem.mm_node) {

			evict_mem.mm_node->private = NULL;

			drm_mm_put_block(evict_mem.mm_node);

			evict_mem.mm_node = NULL;

		}
@@ -929,8 +927,6 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo, 
		mem->mm_node = node;

		mem->mem_type = mem_type;

		mem->placement = cur_flags;

		if (node)

			node->private = bo;

		return 0;

	}
@@ -973,7 +969,6 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo, 
						interruptible, no_wait_reserve, no_wait_gpu);

		if (ret == 0 && mem->mm_node) {

			mem->placement = cur_flags;

			mem->mm_node->private = bo;

			return 0;

		}

		if (ret == -ERESTARTSYS)
@@ -1029,7 +1024,6 @@ int ttm_bo_move_buffer(struct ttm_buffer_object *bo, 
out_unlock:

	if (ret && mem.mm_node) {

		spin_lock(&glob->lru_lock);

		mem.mm_node->private = NULL;

		drm_mm_put_block(mem.mm_node);

		spin_unlock(&glob->lru_lock);

	}

drivers/gpu/drm/ttm/ttm_bo_util.c

+0 −2
Original line number Diff line number Diff line
@@ -353,8 +353,6 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo, 
	fbo->vm_node = NULL;



	fbo->sync_obj = driver->sync_obj_ref(bo->sync_obj);

	if (fbo->mem.mm_node)

		fbo->mem.mm_node->private = (void *)fbo;

	kref_init(&fbo->list_kref);

	kref_init(&fbo->kref);

	fbo->destroy = &ttm_transfered_destroy;

include/drm/drm_mm.h

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ struct drm_mm_node { 
	unsigned long start;

	unsigned long size;

	struct drm_mm *mm;

	void *private;

};



struct drm_mm {