diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-03 13:15:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-03 13:15:40 -0500 |
| commit | da4a22cba7cb2d922691214aed6b1977f04efaff (patch) | |
| tree | 89d3f02b13cd1eb280a33240878880f91066bac2 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 20ebc0073b0fb63ce4a27ca761418ecfdecaadb7 (diff) | |
| parent | e5beae16901795223d677f15aa2fe192976278ee (diff) | |
Merge branch 'io-mappings-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'io-mappings-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
io mapping: clean up #ifdefs
io mapping: improve documentation
i915: use io-mapping interfaces instead of a variety of mapping kludges
resources: add io-mapping functions to dynamically map large device apertures
x86: add iomap_atomic*()/iounmap_atomic() on 32-bit using fixmaps
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index cc8a9f3f7a60..572dcd0e3e0d 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #define _I915_DRV_H_ | 31 | #define _I915_DRV_H_ |
| 32 | 32 | ||
| 33 | #include "i915_reg.h" | 33 | #include "i915_reg.h" |
| 34 | #include <linux/io-mapping.h> | ||
| 34 | 35 | ||
| 35 | /* General customization: | 36 | /* General customization: |
| 36 | */ | 37 | */ |
| @@ -246,6 +247,8 @@ typedef struct drm_i915_private { | |||
| 246 | struct { | 247 | struct { |
| 247 | struct drm_mm gtt_space; | 248 | struct drm_mm gtt_space; |
| 248 | 249 | ||
| 250 | struct io_mapping *gtt_mapping; | ||
| 251 | |||
| 249 | /** | 252 | /** |
| 250 | * List of objects currently involved in rendering from the | 253 | * List of objects currently involved in rendering from the |
| 251 | * ringbuffer. | 254 | * ringbuffer. |