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

Commit 01c8f1c4 authored by Dan Williams's avatar Dan Williams Committed by Linus Torvalds
Browse files

mm, dax, gpu: convert vm_insert_mixed to pfn_t 



Convert the raw unsigned long 'pfn' argument to pfn_t for the purpose of
evaluating the PFN_MAP and PFN_DEV flags.  When both are set it triggers
_PAGE_DEVMAP to be set in the resulting pte.

There are no functional changes to the gpu drivers as a result of this
conversion.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Cc: Dave Hansen <dave@sr71.net>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 69660fd7

arch/x86/include/asm/pgtable.h

+5 −0
Original line number Diff line number Diff line
@@ -247,6 +247,11 @@ static inline pte_t pte_mkspecial(pte_t pte) 
	return pte_set_flags(pte, _PAGE_SPECIAL);

}



static inline pte_t pte_mkdevmap(pte_t pte)

{

	return pte_set_flags(pte, _PAGE_SPECIAL|_PAGE_DEVMAP);

}



static inline pmd_t pmd_set_flags(pmd_t pmd, pmdval_t set)

{

	pmdval_t v = native_pmd_val(pmd);

drivers/gpu/drm/exynos/exynos_drm_gem.c

+3 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include <linux/shmem_fs.h>

#include <linux/dma-buf.h>

#include <linux/pfn_t.h>

#include <drm/exynos_drm.h>



#include "exynos_drm_drv.h"
@@ -490,7 +491,8 @@ int exynos_drm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	}



	pfn = page_to_pfn(exynos_gem->pages[page_offset]);

	ret = vm_insert_mixed(vma, (unsigned long)vmf->virtual_address, pfn);

	ret = vm_insert_mixed(vma, (unsigned long)vmf->virtual_address,

			__pfn_to_pfn_t(pfn, PFN_DEV));



out:

	switch (ret) {

drivers/gpu/drm/gma500/framebuffer.c

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/kernel.h>

#include <linux/errno.h>

#include <linux/string.h>

#include <linux/pfn_t.h>

#include <linux/mm.h>

#include <linux/tty.h>

#include <linux/slab.h>
@@ -132,7 +133,8 @@ static int psbfb_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	for (i = 0; i < page_num; i++) {

		pfn = (phys_addr >> PAGE_SHIFT);



		ret = vm_insert_mixed(vma, address, pfn);

		ret = vm_insert_mixed(vma, address,

				__pfn_to_pfn_t(pfn, PFN_DEV));

		if (unlikely((ret == -EBUSY) || (ret != 0 && i > 0)))

			break;

		else if (unlikely(ret != 0)) {

drivers/gpu/drm/msm/msm_gem.c

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/spinlock.h>

#include <linux/shmem_fs.h>

#include <linux/dma-buf.h>

#include <linux/pfn_t.h>



#include "msm_drv.h"

#include "msm_gem.h"
@@ -222,7 +223,8 @@ int msm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	VERB("Inserting %p pfn %lx, pa %lx", vmf->virtual_address,

			pfn, pfn << PAGE_SHIFT);



	ret = vm_insert_mixed(vma, (unsigned long)vmf->virtual_address, pfn);

	ret = vm_insert_mixed(vma, (unsigned long)vmf->virtual_address,

			__pfn_to_pfn_t(pfn, PFN_DEV));



out_unlock:

	mutex_unlock(&dev->struct_mutex);

drivers/gpu/drm/omapdrm/omap_gem.c

+5 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <linux/shmem_fs.h>

#include <linux/spinlock.h>

#include <linux/pfn_t.h>



#include <drm/drm_vma_manager.h>
@@ -385,7 +386,8 @@ static int fault_1d(struct drm_gem_object *obj, 
	VERB("Inserting %p pfn %lx, pa %lx", vmf->virtual_address,

			pfn, pfn << PAGE_SHIFT);



	return vm_insert_mixed(vma, (unsigned long)vmf->virtual_address, pfn);

	return vm_insert_mixed(vma, (unsigned long)vmf->virtual_address,

			__pfn_to_pfn_t(pfn, PFN_DEV));

}



/* Special handling for the case of faulting in 2d tiled buffers */
@@ -478,7 +480,8 @@ static int fault_2d(struct drm_gem_object *obj, 
			pfn, pfn << PAGE_SHIFT);



	for (i = n; i > 0; i--) {

		vm_insert_mixed(vma, (unsigned long)vaddr, pfn);

		vm_insert_mixed(vma, (unsigned long)vaddr,

				__pfn_to_pfn_t(pfn, PFN_DEV));

		pfn += usergart[fmt].stride_pfn;

		vaddr += PAGE_SIZE * m;

	}