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

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

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

* 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux:
  drm/omap: remove null test before kfree
  drm/bochs: replace ALIGN(PAGE_SIZE) by PAGE_ALIGN
  drm/ttm: recognize ARM arch in ioprot handler
  drm: enable render-nodes by default
  drm/ttm: remove declaration of ttm_tt_cache_flush
  drm/gem: remove misleading gfp parameter to get_pages()
  drm/omap: use __GFP_DMA32 for shmem-backed gem
  drm/i915: use shmem helpers if possible

Conflicts:
	drivers/gpu/drm/drm_stub.c
parents afa95e74 d2c87e2d

drivers/gpu/drm/bochs/bochs_mm.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ int bochs_gem_create(struct drm_device *dev, u32 size, bool iskernel, 


	*obj = NULL;



	size = ALIGN(size, PAGE_SIZE);

	size = PAGE_ALIGN(size);

	if (size == 0)

		return -EINVAL;

drivers/gpu/drm/drm_gem.c

+20 −9
Original line number Diff line number Diff line
@@ -441,18 +441,31 @@ EXPORT_SYMBOL(drm_gem_create_mmap_offset); 
 * drm_gem_get_pages - helper to allocate backing pages for a GEM object

 * from shmem

 * @obj: obj in question

 * @gfpmask: gfp mask of requested pages

 *

 * This reads the page-array of the shmem-backing storage of the given gem

 * object. An array of pages is returned. If a page is not allocated or

 * swapped-out, this will allocate/swap-in the required pages. Note that the

 * whole object is covered by the page-array and pinned in memory.

 *

 * Use drm_gem_put_pages() to release the array and unpin all pages.

 *

 * This uses the GFP-mask set on the shmem-mapping (see mapping_set_gfp_mask()).

 * If you require other GFP-masks, you have to do those allocations yourself.

 *

 * Note that you are not allowed to change gfp-zones during runtime. That is,

 * shmem_read_mapping_page_gfp() must be called with the same gfp_zone(gfp) as

 * set during initialization. If you have special zone constraints, set them

 * after drm_gem_init_object() via mapping_set_gfp_mask(). shmem-core takes care

 * to keep pages in the required zone during swap-in.

 */

struct page **drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask)

struct page **drm_gem_get_pages(struct drm_gem_object *obj)

{

	struct inode *inode;

	struct address_space *mapping;

	struct page *p, **pages;

	int i, npages;



	/* This is the shared memory object that backs the GEM resource */

	inode = file_inode(obj->filp);

	mapping = inode->i_mapping;

	mapping = file_inode(obj->filp)->i_mapping;



	/* We already BUG_ON() for non-page-aligned sizes in

	 * drm_gem_object_init(), so we should never hit this unless
@@ -466,10 +479,8 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask) 
	if (pages == NULL)

		return ERR_PTR(-ENOMEM);



	gfpmask |= mapping_gfp_mask(mapping);



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

		p = shmem_read_mapping_page_gfp(mapping, i, gfpmask);

		p = shmem_read_mapping_page(mapping, i);

		if (IS_ERR(p))

			goto fail;

		pages[i] = p;
@@ -479,7 +490,7 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask) 
		 * __GFP_DMA32 to be set in mapping_gfp_mask(inode->i_mapping)

		 * so shmem can relocate pages during swapin if required.

		 */

		BUG_ON((gfpmask & __GFP_DMA32) &&

		BUG_ON((mapping_gfp_mask(mapping) & __GFP_DMA32) &&

				(page_to_pfn(p) >= 0x00100000UL));

	}

drivers/gpu/drm/drm_stub.c

+1 −5
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ 
unsigned int drm_debug = 0;	/* 1 to enable debug output */

EXPORT_SYMBOL(drm_debug);



unsigned int drm_rnodes = 0;	/* 1 to enable experimental render nodes API */



/* 1 to allow user space to request universal planes (experimental) */

unsigned int drm_universal_planes = 0;
@@ -56,13 +54,11 @@ MODULE_AUTHOR(CORE_AUTHOR); 
MODULE_DESCRIPTION(CORE_DESC);

MODULE_LICENSE("GPL and additional rights");

MODULE_PARM_DESC(debug, "Enable debug output");

MODULE_PARM_DESC(rnodes, "Enable experimental render nodes API");

MODULE_PARM_DESC(vblankoffdelay, "Delay until vblank irq auto-disable [msecs]");

MODULE_PARM_DESC(timestamp_precision_usec, "Max. error on timestamps [usecs]");

MODULE_PARM_DESC(timestamp_monotonic, "Use monotonic timestamps");



module_param_named(debug, drm_debug, int, 0600);

module_param_named(rnodes, drm_rnodes, int, 0600);

module_param_named(universal_planes, drm_universal_planes, int, 0600);

module_param_named(vblankoffdelay, drm_vblank_offdelay, int, 0600);

module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600);
@@ -584,7 +580,7 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver, 
			goto err_minors;

	}



	if (drm_core_check_feature(dev, DRIVER_RENDER) && drm_rnodes) {

	if (drm_core_check_feature(dev, DRIVER_RENDER)) {

		ret = drm_minor_alloc(dev, DRM_MINOR_RENDER);

		if (ret)

			goto err_minors;

drivers/gpu/drm/gma500/gtt.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static int psb_gtt_attach_pages(struct gtt_range *gt) 


	WARN_ON(gt->pages);



	pages = drm_gem_get_pages(&gt->gem, 0);

	pages = drm_gem_get_pages(&gt->gem);

	if (IS_ERR(pages))

		return PTR_ERR(pages);

drivers/gpu/drm/i915/i915_gem.c

+1 −7
Original line number Diff line number Diff line
@@ -2059,16 +2059,10 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
			 * our own buffer, now let the real VM do its job and

			 * go down in flames if truly OOM.

			 */

			gfp &= ~(__GFP_NORETRY | __GFP_NOWARN | __GFP_NO_KSWAPD);

			gfp |= __GFP_IO | __GFP_WAIT;



			i915_gem_shrink_all(dev_priv);

			page = shmem_read_mapping_page_gfp(mapping, i, gfp);

			page = shmem_read_mapping_page(mapping, i);

			if (IS_ERR(page))

				goto err_pages;



			gfp |= __GFP_NORETRY | __GFP_NOWARN | __GFP_NO_KSWAPD;

			gfp &= ~(__GFP_IO | __GFP_WAIT);

		}

#ifdef CONFIG_SWIOTLB

		if (swiotlb_nr_tbl()) {