diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 08:17:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 08:17:04 -0800 |
| commit | f8abea8f8c24ecdad6d6861bffb912f23f2741cd (patch) | |
| tree | 7d5af9c3d92b3afd0d585aabd6537db36c8095ae /include | |
| parent | ef29498655b18d2bfd69048e20835d19333981ab (diff) | |
| parent | 1c14cfbbe7a9f2240c73f420c3c6336fc521cd64 (diff) | |
| download | linux-f8abea8f8c24ecdad6d6861bffb912f23f2741cd.tar.gz linux-f8abea8f8c24ecdad6d6861bffb912f23f2741cd.tar.bz2 linux-f8abea8f8c24ecdad6d6861bffb912f23f2741cd.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
[AGPGART] allow drm populated agp memory types cleanups
[AGPGART] intel-agp: Use ARRAY_SIZE macro when appropriate
[AGPGART] Add agp-type-to-mask-type method missing from some drivers.
[AGPGART] Don't try to remap i810 registers on resume.
[AGPGART] Allow drm-populated agp memory types
[AGPGART] compat ioctl
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/agp_backend.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h index a5c8bb5d80ba..abc521cfb084 100644 --- a/include/linux/agp_backend.h +++ b/include/linux/agp_backend.h @@ -87,10 +87,15 @@ struct agp_memory { u32 physical; u8 is_bound; u8 is_flushed; + u8 vmalloc_flag; }; #define AGP_NORMAL_MEMORY 0 +#define AGP_USER_TYPES (1 << 16) +#define AGP_USER_MEMORY (AGP_USER_TYPES) +#define AGP_USER_CACHED_MEMORY (AGP_USER_TYPES + 1) + extern struct agp_bridge_data *agp_bridge; extern struct list_head agp_bridges; |