diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-14 18:37:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-14 18:37:05 -0700 |
| commit | 21c562e39c5927ce8408f5ec8680f98e9df1e9e3 (patch) | |
| tree | ccec46f9ff2041a52397e8c17f88bcfe6b577c4f /drivers/char/drm/i915_drv.h | |
| parent | aba297927d1d558c7a94548135133bdf9172708a (diff) | |
| parent | 9b01bd5b284bbf519b726b39f1352023cb5e9e69 (diff) | |
| download | talos-op-linux-21c562e39c5927ce8408f5ec8680f98e9df1e9e3.tar.gz talos-op-linux-21c562e39c5927ce8408f5ec8680f98e9df1e9e3.zip | |
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: fix radeon setparam on 32/64 bit systems.
drm/i915: Add support for the G33, Q33, and Q35 chipsets.
i915: add new pciids for 945GME, 965GME/GLE
Diffstat (limited to 'drivers/char/drm/i915_drv.h')
| -rw-r--r-- | drivers/char/drm/i915_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h index 93cdcfe6aa84..85e323acb95d 100644 --- a/drivers/char/drm/i915_drv.h +++ b/drivers/char/drm/i915_drv.h @@ -91,6 +91,8 @@ typedef struct drm_i915_private { void *hw_status_page; dma_addr_t dma_status_page; unsigned long counter; + unsigned int status_gfx_addr; + drm_local_map_t hws_map; unsigned int cpp; int back_offset; |
