diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-07-11 11:23:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-07-11 11:23:41 +1000 |
| commit | 2c9e05cf4c6eb18c941321f764ed1b282a314ba9 (patch) | |
| tree | d5bcbe9114fac7e03549ae05a9e6dffc793fcbaf /shared-core/i915_drm.h | |
| parent | 9b9a127ed0fe9a6a8e2fde84739ccff6fa0bc5ac (diff) | |
| parent | 694e1c5c3f768436651ddf95e11ab5a89ccc8ffa (diff) | |
Merge branch 'master' into cleanup
Conflicts:
libdrm/xf86drm.c
linux-core/drm_bo.c
linux-core/drm_fence.c
Diffstat (limited to 'shared-core/i915_drm.h')
| -rw-r--r-- | shared-core/i915_drm.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h index 1f32313e..1c6ff4d3 100644 --- a/shared-core/i915_drm.h +++ b/shared-core/i915_drm.h @@ -159,6 +159,7 @@ typedef struct _drm_i915_sarea { #define DRM_I915_GET_VBLANK_PIPE 0x0e #define DRM_I915_VBLANK_SWAP 0x0f #define DRM_I915_MMIO 0x10 +#define DRM_I915_HWS_ADDR 0x11 #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t) #define DRM_IOCTL_I915_FLUSH DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH) @@ -314,4 +315,8 @@ typedef struct drm_i915_mmio { void __user *data; } drm_i915_mmio_t; +typedef struct drm_i915_hws_addr { + uint64_t addr; +} drm_i915_hws_addr_t; + #endif /* _I915_DRM_H_ */ |