Subversion Repositories Kolibri OS

Rev

Rev 6937 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 6937 Rev 7144
Line 114... Line 114...
114
	} else
114
	} else
115
		drm_mm_init_scan(&vm->mm, min_size, alignment, cache_level);
115
		drm_mm_init_scan(&vm->mm, min_size, alignment, cache_level);
Line 116... Line 116...
116
 
116
 
117
search_again:
117
search_again:
118
	/* First see if there is a large enough contiguous idle region... */
118
	/* First see if there is a large enough contiguous idle region... */
119
	list_for_each_entry(vma, &vm->inactive_list, mm_list) {
119
	list_for_each_entry(vma, &vm->inactive_list, vm_link) {
120
		if (mark_free(vma, &unwind_list))
120
		if (mark_free(vma, &unwind_list))
121
			goto found;
121
			goto found;
Line 122... Line 122...
122
	}
122
	}
123
 
123
 
Line 124... Line 124...
124
	if (flags & PIN_NONBLOCK)
124
	if (flags & PIN_NONBLOCK)
125
		goto none;
125
		goto none;
126
 
126
 
127
	/* Now merge in the soon-to-be-expired objects... */
127
	/* Now merge in the soon-to-be-expired objects... */
128
	list_for_each_entry(vma, &vm->active_list, mm_list) {
128
	list_for_each_entry(vma, &vm->active_list, vm_link) {
Line 129... Line 129...
129
		if (mark_free(vma, &unwind_list))
129
		if (mark_free(vma, &unwind_list))
Line 268... Line 268...
268
		i915_gem_retire_requests(vm->dev);
268
		i915_gem_retire_requests(vm->dev);
Line 269... Line 269...
269
 
269
 
270
		WARN_ON(!list_empty(&vm->active_list));
270
		WARN_ON(!list_empty(&vm->active_list));
Line 271... Line 271...
271
	}
271
	}
272
 
272
 
273
	list_for_each_entry_safe(vma, next, &vm->inactive_list, mm_list)
273
	list_for_each_entry_safe(vma, next, &vm->inactive_list, vm_link)
Line 274... Line 274...
274
		if (vma->pin_count == 0)
274
		if (vma->pin_count == 0)
275
			WARN_ON(i915_vma_unbind(vma));
275
			WARN_ON(i915_vma_unbind(vma));