diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-08 21:03:28 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-08 21:03:28 +0300 |
| commit | 0c0e8caf9fd6c9a49fb9fbdba14a8b7b4239adde (patch) | |
| tree | c9b873f23b9d7d1fc7573788233104e0e501d269 /drivers/char/drm/i830_drv.h | |
| parent | b892afd1e60132a981b963929e352eabf3306ba2 (diff) | |
| parent | 1545085a28f226b59c243f88b82ea25393b0d63f (diff) | |
| download | linux-0c0e8caf9fd6c9a49fb9fbdba14a8b7b4239adde.tar.xz | |
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: Allow for 44 bit user-tokens (or drm_file offsets)
drm/via: Disable AGP DMA for chips with the new 3D engine.
drm: update core memory manager from git drm tree
drm: remove drm_ioremap and drm_ioremapfree
i810/i830: use drm_core_ioremap instead of drm_ioremap
drm: use vmalloc_user instead of vmalloc_32 for DRM_SHM
via: allow for npot texture pitch alignment
via: add some new chipsets
via: some PCI posting flushes
Diffstat (limited to 'drivers/char/drm/i830_drv.h')
| -rw-r--r-- | drivers/char/drm/i830_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/drm/i830_drv.h b/drivers/char/drm/i830_drv.h index 85bc5be6f916..e91f94afb4bb 100644 --- a/drivers/char/drm/i830_drv.h +++ b/drivers/char/drm/i830_drv.h @@ -68,6 +68,7 @@ typedef struct drm_i830_buf_priv { int currently_mapped; void __user *virtual; void *kernel_virtual; + drm_local_map_t map; } drm_i830_buf_priv_t; typedef struct _drm_i830_ring_buffer { @@ -79,6 +80,7 @@ typedef struct _drm_i830_ring_buffer { int head; int tail; int space; + drm_local_map_t map; } drm_i830_ring_buffer_t; typedef struct drm_i830_private { |