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

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

Merge branch 'drm-ttm-pool' into drm-core-next 

* drm-ttm-pool:
  drm/ttm: using kmalloc/kfree requires including slab.h
  drm/ttm: include linux/seq_file.h for seq_printf
  drm/ttm: Add sysfs interface to control pool allocator.
  drm/ttm: Use set_pages_array_wc instead of set_memory_wc.
  arch/x86: Add array variants for setting memory to wc caching.
  drm/nouveau: Add ttm page pool debugfs file.
  drm/radeon/kms: Add ttm page pool debugfs file.
  drm/ttm: Add debugfs output entry to pool allocator.
  drm/ttm: add pool wc/uc page allocator V3
parents 97921a5b 2125b8a4

arch/x86/include/asm/cacheflush.h

+2 −0
Original line number Diff line number Diff line
@@ -139,9 +139,11 @@ int set_memory_np(unsigned long addr, int numpages); 
int set_memory_4k(unsigned long addr, int numpages);



int set_memory_array_uc(unsigned long *addr, int addrinarray);

int set_memory_array_wc(unsigned long *addr, int addrinarray);

int set_memory_array_wb(unsigned long *addr, int addrinarray);



int set_pages_array_uc(struct page **pages, int addrinarray);

int set_pages_array_wc(struct page **pages, int addrinarray);

int set_pages_array_wb(struct page **pages, int addrinarray);



/*

arch/x86/mm/pageattr.c

+45 −8
Original line number Diff line number Diff line
@@ -997,7 +997,8 @@ int set_memory_uc(unsigned long addr, int numpages) 
}

EXPORT_SYMBOL(set_memory_uc);



int set_memory_array_uc(unsigned long *addr, int addrinarray)

int _set_memory_array(unsigned long *addr, int addrinarray,

		unsigned long new_type)

{

	int i, j;

	int ret;
@@ -1007,13 +1008,19 @@ int set_memory_array_uc(unsigned long *addr, int addrinarray) 
	 */

	for (i = 0; i < addrinarray; i++) {

		ret = reserve_memtype(__pa(addr[i]), __pa(addr[i]) + PAGE_SIZE,

					_PAGE_CACHE_UC_MINUS, NULL);

					new_type, NULL);

		if (ret)

			goto out_free;

	}



	ret = change_page_attr_set(addr, addrinarray,

				    __pgprot(_PAGE_CACHE_UC_MINUS), 1);



	if (!ret && new_type == _PAGE_CACHE_WC)

		ret = change_page_attr_set_clr(addr, addrinarray,

					       __pgprot(_PAGE_CACHE_WC),

					       __pgprot(_PAGE_CACHE_MASK),

					       0, CPA_ARRAY, NULL);

	if (ret)

		goto out_free;
@@ -1025,8 +1032,19 @@ int set_memory_array_uc(unsigned long *addr, int addrinarray) 


	return ret;

}



int set_memory_array_uc(unsigned long *addr, int addrinarray)

{

	return _set_memory_array(addr, addrinarray, _PAGE_CACHE_UC_MINUS);

}

EXPORT_SYMBOL(set_memory_array_uc);



int set_memory_array_wc(unsigned long *addr, int addrinarray)

{

	return _set_memory_array(addr, addrinarray, _PAGE_CACHE_WC);

}

EXPORT_SYMBOL(set_memory_array_wc);



int _set_memory_wc(unsigned long addr, int numpages)

{

	int ret;
@@ -1153,26 +1171,34 @@ int set_pages_uc(struct page *page, int numpages) 
}

EXPORT_SYMBOL(set_pages_uc);



int set_pages_array_uc(struct page **pages, int addrinarray)

static int _set_pages_array(struct page **pages, int addrinarray,

		unsigned long new_type)

{

	unsigned long start;

	unsigned long end;

	int i;

	int free_idx;

	int ret;



	for (i = 0; i < addrinarray; i++) {

		if (PageHighMem(pages[i]))

			continue;

		start = page_to_pfn(pages[i]) << PAGE_SHIFT;

		end = start + PAGE_SIZE;

		if (reserve_memtype(start, end, _PAGE_CACHE_UC_MINUS, NULL))

		if (reserve_memtype(start, end, new_type, NULL))

			goto err_out;

	}



	if (cpa_set_pages_array(pages, addrinarray,

			__pgprot(_PAGE_CACHE_UC_MINUS)) == 0) {

	ret = cpa_set_pages_array(pages, addrinarray,

			__pgprot(_PAGE_CACHE_UC_MINUS));

	if (!ret && new_type == _PAGE_CACHE_WC)

		ret = change_page_attr_set_clr(NULL, addrinarray,

					       __pgprot(_PAGE_CACHE_WC),

					       __pgprot(_PAGE_CACHE_MASK),

					       0, CPA_PAGES_ARRAY, pages);

	if (ret)

		goto err_out;

	return 0; /* Success */

	}

err_out:

	free_idx = i;

	for (i = 0; i < free_idx; i++) {
@@ -1184,8 +1210,19 @@ int set_pages_array_uc(struct page **pages, int addrinarray) 
	}

	return -EINVAL;

}



int set_pages_array_uc(struct page **pages, int addrinarray)

{

	return _set_pages_array(pages, addrinarray, _PAGE_CACHE_UC_MINUS);

}

EXPORT_SYMBOL(set_pages_array_uc);



int set_pages_array_wc(struct page **pages, int addrinarray)

{

	return _set_pages_array(pages, addrinarray, _PAGE_CACHE_WC);

}

EXPORT_SYMBOL(set_pages_array_wc);



int set_pages_wb(struct page *page, int numpages)

{

	unsigned long addr = (unsigned long)page_address(page);

drivers/gpu/drm/nouveau/nouveau_debugfs.c

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#include "drmP.h"

#include "nouveau_drv.h"



#include <ttm/ttm_page_alloc.h>



static int

nouveau_debugfs_channel_info(struct seq_file *m, void *data)

{
@@ -159,6 +161,7 @@ static struct drm_info_list nouveau_debugfs_list[] = { 
	{ "chipset", nouveau_debugfs_chipset_info, 0, NULL },

	{ "memory", nouveau_debugfs_memory_info, 0, NULL },

	{ "vbios.rom", nouveau_debugfs_vbios_image, 0, NULL },

	{ "ttm_page_pool", ttm_page_alloc_debugfs, 0, NULL },

};

#define NOUVEAU_DEBUGFS_ENTRIES ARRAY_SIZE(nouveau_debugfs_list)

drivers/gpu/drm/radeon/radeon_ttm.c

+10 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <ttm/ttm_bo_driver.h>

#include <ttm/ttm_placement.h>

#include <ttm/ttm_module.h>

#include <ttm/ttm_page_alloc.h>

#include <drm/drmP.h>

#include <drm/radeon_drm.h>

#include <linux/seq_file.h>
@@ -745,8 +746,8 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data) 
static int radeon_ttm_debugfs_init(struct radeon_device *rdev)

{

#if defined(CONFIG_DEBUG_FS)

	static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES];

	static char radeon_mem_types_names[RADEON_DEBUGFS_MEM_TYPES][32];

	static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+1];

	static char radeon_mem_types_names[RADEON_DEBUGFS_MEM_TYPES+1][32];

	unsigned i;



	for (i = 0; i < RADEON_DEBUGFS_MEM_TYPES; i++) {
@@ -763,7 +764,13 @@ static int radeon_ttm_debugfs_init(struct radeon_device *rdev) 
			radeon_mem_types_list[i].data = &rdev->mman.bdev.man[TTM_PL_TT].manager;



	}

	return radeon_debugfs_add_files(rdev, radeon_mem_types_list, RADEON_DEBUGFS_MEM_TYPES);

	/* Add ttm page pool to debugfs */

	sprintf(radeon_mem_types_names[i], "ttm_page_pool");

	radeon_mem_types_list[i].name = radeon_mem_types_names[i];

	radeon_mem_types_list[i].show = &ttm_page_alloc_debugfs;

	radeon_mem_types_list[i].driver_features = 0;

	radeon_mem_types_list[i].data = NULL;

	return radeon_debugfs_add_files(rdev, radeon_mem_types_list, RADEON_DEBUGFS_MEM_TYPES+1);



#endif

	return 0;

drivers/gpu/drm/ttm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ 
ccflags-y := -Iinclude/drm

ttm-y := ttm_agp_backend.o ttm_memory.o ttm_tt.o ttm_bo.o \

	ttm_bo_util.o ttm_bo_vm.o ttm_module.o ttm_global.o \

	ttm_object.o ttm_lock.o ttm_execbuf_util.o

	ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o



obj-$(CONFIG_DRM_TTM) += ttm.o