drm/ttm: use drm calloc large and free large (72e942dd) · Commits · 戴 / test

drivers/gpu/drm/ttm/ttm_tt.c

+3 −20

Original line number	Diff line number	Diff line
		@@ -28,13 +28,13 @@
		* Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
		*/

		#include <linux/vmalloc.h>
		#include <linux/sched.h>
		#include <linux/highmem.h>
		#include <linux/pagemap.h>
		#include <linux/file.h>
		#include <linux/swap.h>
		#include "drm_cache.h"
		#include "drm_mem_util.h"
		#include "ttm/ttm_module.h"
		#include "ttm/ttm_bo_driver.h"
		#include "ttm/ttm_placement.h"
		@@ -43,32 +43,15 @@ static int ttm_tt_swapin(struct ttm_tt *ttm);

		/**
		* Allocates storage for pointers to the pages that back the ttm.
		*
		* Uses kmalloc if possible. Otherwise falls back to vmalloc.
		*/
		static void ttm_tt_alloc_page_directory(struct ttm_tt *ttm)
		{
		unsigned long size = ttm->num_pages * sizeof(*ttm->pages);
		ttm->pages = NULL;

		if (size <= PAGE_SIZE)
		ttm->pages = kzalloc(size, GFP_KERNEL);

		if (!ttm->pages) {
		ttm->pages = vmalloc_user(size);
		if (ttm->pages)
		ttm->page_flags \|= TTM_PAGE_FLAG_VMALLOC;
		}
		ttm->pages = drm_calloc_large(ttm->num_pages, sizeof(*ttm->pages));
		}

		static void ttm_tt_free_page_directory(struct ttm_tt *ttm)
		{
		if (ttm->page_flags & TTM_PAGE_FLAG_VMALLOC) {
		vfree(ttm->pages);
		ttm->page_flags &= ~TTM_PAGE_FLAG_VMALLOC;
		} else {
		kfree(ttm->pages);
		}
		drm_free_large(ttm->pages);
		ttm->pages = NULL;
		}

include/drm/drmP.h

+1 −33

Original line number	Diff line number	Diff line
		@@ -1545,39 +1545,7 @@ static __inline__ void drm_core_dropmap(struct drm_local_map *map)
		{
		}


		static __inline__ void *drm_calloc_large(size_t nmemb, size_t size)
		{
		if (size != 0 && nmemb > ULONG_MAX / size)
		return NULL;

		if (size * nmemb <= PAGE_SIZE)
		return kcalloc(nmemb, size, GFP_KERNEL);

		return __vmalloc(size * nmemb,
		GFP_KERNEL \| __GFP_HIGHMEM \| __GFP_ZERO, PAGE_KERNEL);
		}

		/* Modeled after cairo's malloc_ab, it's like calloc but without the zeroing. */
		static __inline__ void *drm_malloc_ab(size_t nmemb, size_t size)
		{
		if (size != 0 && nmemb > ULONG_MAX / size)
		return NULL;

		if (size * nmemb <= PAGE_SIZE)
		return kmalloc(nmemb * size, GFP_KERNEL);

		return __vmalloc(size * nmemb,
		GFP_KERNEL \| __GFP_HIGHMEM, PAGE_KERNEL);
		}

		static __inline void drm_free_large(void *ptr)
		{
		if (!is_vmalloc_addr(ptr))
		return kfree(ptr);

		vfree(ptr);
		}
		#include "drm_mem_util.h"
		/@}/

		#endif /* __KERNEL__ */

include/drm/drm_mem_util.h

0 → 100644

+65 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright © 2008 Intel Corporation
		*
		* Permission is hereby granted, free of charge, to any person obtaining a
		* copy of this software and associated documentation files (the "Software"),
		* to deal in the Software without restriction, including without limitation
		* the rights to use, copy, modify, merge, publish, distribute, sublicense,
		* and/or sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice (including the next
		* paragraph) shall be included in all copies or substantial portions of the
		* Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
		* IN THE SOFTWARE.
		*
		* Authors:
		* Jesse Barnes <jbarnes@virtuousgeek.org>
		*
		*/
		#ifndef _DRM_MEM_UTIL_H_
		#define _DRM_MEM_UTIL_H_

		#include <linux/vmalloc.h>

		static __inline__ void *drm_calloc_large(size_t nmemb, size_t size)
		{
		if (size != 0 && nmemb > ULONG_MAX / size)
		return NULL;

		if (size * nmemb <= PAGE_SIZE)
		return kcalloc(nmemb, size, GFP_KERNEL);

		return __vmalloc(size * nmemb,
		GFP_KERNEL \| __GFP_HIGHMEM \| __GFP_ZERO, PAGE_KERNEL);
		}

		/* Modeled after cairo's malloc_ab, it's like calloc but without the zeroing. */
		static __inline__ void *drm_malloc_ab(size_t nmemb, size_t size)
		{
		if (size != 0 && nmemb > ULONG_MAX / size)
		return NULL;

		if (size * nmemb <= PAGE_SIZE)
		return kmalloc(nmemb * size, GFP_KERNEL);

		return __vmalloc(size * nmemb,
		GFP_KERNEL \| __GFP_HIGHMEM, PAGE_KERNEL);
		}

		static __inline void drm_free_large(void *ptr)
		{
		if (!is_vmalloc_addr(ptr))
		return kfree(ptr);

		vfree(ptr);
		}

		#endif

include/drm/ttm/ttm_bo_driver.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -115,7 +115,6 @@ struct ttm_backend {
		struct ttm_backend_func *func;
		};

		#define TTM_PAGE_FLAG_VMALLOC (1 << 0)
		#define TTM_PAGE_FLAG_USER (1 << 1)
		#define TTM_PAGE_FLAG_USER_DIRTY (1 << 2)
		#define TTM_PAGE_FLAG_WRITE (1 << 3)

Admin message