Deleted Added
full compact
30c30
< __FBSDID("$FreeBSD: stable/10/sys/dev/drm2/radeon/radeon_device.c 267042 2014-06-04 09:44:05Z marius $");
---
> __FBSDID("$FreeBSD: stable/10/sys/dev/drm2/radeon/radeon_device.c 275408 2014-12-02 14:09:54Z tijl $");
1016a1017
> rdev->fictitious_agp_range_registered = false;
1170a1172,1189
> #if __OS_HAS_AGP
> if (rdev->flags & RADEON_IS_AGP) {
> DRM_INFO("%s: Taking over the fictitious range 0x%jx-0x%jx\n",
> __func__, (uintmax_t)rdev->mc.agp_base,
> (uintmax_t)rdev->mc.agp_base + rdev->mc.gtt_size);
> r = vm_phys_fictitious_reg_range(
> rdev->mc.agp_base,
> rdev->mc.agp_base + rdev->mc.gtt_size,
> VM_MEMATTR_WRITE_COMBINING);
> if (r != 0) {
> DRM_ERROR("Failed to register fictitious range "
> "0x%jx-0x%jx (%d).\n", (uintmax_t)rdev->mc.agp_base,
> (uintmax_t)rdev->mc.agp_base + rdev->mc.gtt_size, r);
> return (-r);
> }
> rdev->fictitious_agp_range_registered = true;
> }
> #endif
1207a1227,1233
> #if __OS_HAS_AGP
> if (rdev->fictitious_agp_range_registered) {
> vm_phys_fictitious_unreg_range(
> rdev->mc.agp_base,
> rdev->mc.agp_base + rdev->mc.gtt_size);
> }
> #endif