Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f042cc4a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'ttm-fixes-3.14-2014-03-12' of git://people.freedesktop.org/~thomash/linux into drm-fixes 

Second pull request of 2014-03-12. The first one was requested to be canceled.

Rob's fix for oops on invalidate_caches() and a fix for a
performance regression.

* tag 'ttm-fixes-3.14-2014-03-12' of git://people.freedesktop.org/~thomash/linux:
  drm/ttm: don't oops if no invalidate_caches()
  drm/ttm: Work around performance regression with VM_PFNMAP
parents bf21d605 9ef7506f

drivers/gpu/drm/ttm/ttm_bo.c

+5 −3
Original line number Diff line number Diff line
@@ -351,9 +351,11 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, 


moved:

	if (bo->evicted) {

		if (bdev->driver->invalidate_caches) {

			ret = bdev->driver->invalidate_caches(bdev, bo->mem.placement);

			if (ret)

				pr_err("Can not flush read caches\n");

		}

		bo->evicted = false;

	}

drivers/gpu/drm/ttm/ttm_bo_vm.c

+7 −5
Original line number Diff line number Diff line
@@ -339,11 +339,13 @@ int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma, 
	vma->vm_private_data = bo;



	/*

	 * PFNMAP is faster than MIXEDMAP due to reduced page

	 * administration. So use MIXEDMAP only if private VMA, where

	 * we need to support COW.

	 * We'd like to use VM_PFNMAP on shared mappings, where

	 * (vma->vm_flags & VM_SHARED) != 0, for performance reasons,

	 * but for some reason VM_PFNMAP + x86 PAT + write-combine is very

	 * bad for performance. Until that has been sorted out, use

	 * VM_MIXEDMAP on all mappings. See freedesktop.org bug #75719

	 */

	vma->vm_flags |= (vma->vm_flags & VM_SHARED) ? VM_PFNMAP : VM_MIXEDMAP;

	vma->vm_flags |= VM_MIXEDMAP;

	vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;

	return 0;

out_unref:
@@ -359,7 +361,7 @@ int ttm_fbdev_mmap(struct vm_area_struct *vma, struct ttm_buffer_object *bo) 


	vma->vm_ops = &ttm_bo_vm_ops;

	vma->vm_private_data = ttm_bo_reference(bo);

	vma->vm_flags |= (vma->vm_flags & VM_SHARED) ? VM_PFNMAP : VM_MIXEDMAP;

	vma->vm_flags |= VM_MIXEDMAP;

	vma->vm_flags |= VM_IO | VM_DONTEXPAND;

	return 0;

}