Project

General

Profile

Bug #2903 » scatter.diff

davshao, 04/24/2016 12:25 AM

View differences:

sys/dev/drm/i915/i915_gem.c
1684 1684
	vm_size_t size;
1685 1685
	int error = 0, rv;
1686 1686

  
1687
	if (args->flags & ~(I915_MMAP_WC))
1688
		return -EINVAL;
1687
// Switch to the Linux scatterlist API
1688
//	if (args->flags & ~(I915_MMAP_WC))
1689
//		return -EINVAL;
1689 1690

  
1690 1691
	obj = drm_gem_object_lookup(dev, file, args->handle);
1691 1692
	if (obj == NULL)
sys/dev/drm/i915/i915_gem_gtt.c
1612 1612
	}
1613 1613

  
1614 1614
	ppgtt->base.allocate_va_range = aliasing ? NULL : gen6_alloc_va_range;
1615
	ppgtt->base.allocate_va_range = gen6_alloc_va_range;
1615
// Typo duplication? from 7ec9f8e589 Switch to the Linux scatterlist API
1616
//	ppgtt->base.allocate_va_range = gen6_alloc_va_range;
1616 1617
	ppgtt->base.clear_range = gen6_ppgtt_clear_range;
1617 1618
	ppgtt->base.insert_entries = gen6_ppgtt_insert_entries;
1618 1619
	ppgtt->base.unbind_vma = ppgtt_unbind_vma;
(1-1/2)