diff options
| author | Jeremy Kolb <jkolb@brandeis.edu> | 2007-10-31 20:14:48 -0400 |
|---|---|---|
| committer | Jeremy Kolb <jkolb@brandeis.edu> | 2007-10-31 20:14:48 -0400 |
| commit | 9416541fb29666c630f2bcfcc0f3ae0b6c4436d8 (patch) | |
| tree | e9eb35ec99c6173967202518faea490f593be9cf /shared-core | |
| parent | 31847b4b62575739a164e019b33ced0531683403 (diff) | |
| parent | 61cbcb5dbe487c6d4eba04794cbaa0279ab807b0 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/drm.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h index 3a102735..4059a6fb 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -700,10 +700,14 @@ struct drm_fence_arg { */ #define DRM_BO_FLAG_NO_MOVE (1ULL << 8) -/* Mask: Make sure the buffer is in cached memory when mapped for reading. +/* Mask: Make sure the buffer is in cached memory when mapped * Flags: Acknowledge. + * Buffers allocated with this flag should not be used for suballocators + * This type may have issues on CPUs with over-aggressive caching + * http://marc.info/?l=linux-kernel&m=102376926732464&w=2 */ -#define DRM_BO_FLAG_READ_CACHED (1ULL << 19) +#define DRM_BO_FLAG_CACHED_MAPPED (1ULL << 19) + /* Mask: Force DRM_BO_FLAG_CACHED flag strictly also if it is set. * Flags: Acknowledge. @@ -738,7 +742,7 @@ struct drm_fence_arg { /* Memory flag mask */ #define DRM_BO_MASK_MEM 0x00000000FF000000ULL -#define DRM_BO_MASK_MEMTYPE 0x00000000FF0000A0ULL +#define DRM_BO_MASK_MEMTYPE 0x00000000FF0800A0ULL /* Driver-private flags */ #define DRM_BO_MASK_DRIVER 0xFFFF000000000000ULL |