diff options
author | Eric Anholt <eric@anholt.net> | 2007-09-19 15:55:58 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2007-09-19 15:55:58 -0700 |
commit | 3d3a96ad4e5596187236898ca241515a21661b69 (patch) | |
tree | 89b2b0900cf02235741fa670e7947babc8959ebe /bsd-core/drm_memory.c | |
parent | 0055fd5c35306a6363b0414f7f2220b3d1c27ecc (diff) | |
parent | e349b58b4a6ebfe299720cb921039a600c145e65 (diff) |
Merge branch 'origin' into bo-set-pin
Diffstat (limited to 'bsd-core/drm_memory.c')
-rw-r--r-- | bsd-core/drm_memory.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bsd-core/drm_memory.c b/bsd-core/drm_memory.c index 6d467e98..1f1f7f4b 100644 --- a/bsd-core/drm_memory.c +++ b/bsd-core/drm_memory.c @@ -1,6 +1,3 @@ -/* drm_memory.h -- Memory management wrappers for DRM -*- linux-c -*- - * Created: Thu Feb 4 14:00:34 1999 by faith@valinux.com - */ /*- *Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. @@ -31,6 +28,14 @@ * */ +/** @file drm_memory.c + * Wrappers for kernel memory allocation routines, and MTRR management support. + * + * This file previously implemented a memory consumption tracking system using + * the "area" argument for various different types of allocations, but that + * has been stripped out for now. + */ + #include "drmP.h" MALLOC_DEFINE(M_DRM, "drm", "DRM Data Structures"); |