Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next

- The coherent memory changes including mm changes.
- Some vmwgfx debug fixes.
- Removal of vmwgfx legacy security checks.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Hellstrom <VMware> <thomas@shipmail.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190619072531.4026-1-thomas@shipmail.org
This commit is contained in:
Dave Airlie
2019-06-21 12:06:03 +10:00
30 changed files with 2136 additions and 483 deletions

View File

@@ -2686,7 +2686,24 @@ typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,
extern int apply_to_page_range(struct mm_struct *mm, unsigned long address,
unsigned long size, pte_fn_t fn, void *data);
struct pfn_range_apply;
typedef int (*pter_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,
struct pfn_range_apply *closure);
struct pfn_range_apply {
struct mm_struct *mm;
pter_fn_t ptefn;
unsigned int alloc;
};
extern int apply_to_pfn_range(struct pfn_range_apply *closure,
unsigned long address, unsigned long size);
unsigned long apply_as_wrprotect(struct address_space *mapping,
pgoff_t first_index, pgoff_t nr);
unsigned long apply_as_clean(struct address_space *mapping,
pgoff_t first_index, pgoff_t nr,
pgoff_t bitmap_pgoff,
unsigned long *bitmap,
pgoff_t *start,
pgoff_t *end);
#ifdef CONFIG_PAGE_POISONING
extern bool page_poisoning_enabled(void);
extern void kernel_poison_pages(struct page *page, int numpages, int enable);