diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-02 04:14:23 -0500 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-01-02 04:14:23 -0500 |
commit | 0d6aa60b4ac9689b750e35cd66f5d7c053aff0f4 (patch) | |
tree | dfc0d9ddfb139df8612e1823f9af89a6ff000a31 /drivers/char/drm/i915_drm.h | |
parent | f0c408b564ddefa0959ada4e2c2248f4a57f1842 (diff) |
drm: update to i915 1.3.0
Add support for vblank ioctls to i915 driver
From: Dave Airlie <airlied@linux.ie>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/i915_drm.h')
-rw-r--r-- | drivers/char/drm/i915_drm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/drm/i915_drm.h b/drivers/char/drm/i915_drm.h index 23e027d29080..77412ddac007 100644 --- a/drivers/char/drm/i915_drm.h +++ b/drivers/char/drm/i915_drm.h | |||
@@ -1,5 +1,4 @@ | |||
1 | /************************************************************************** | 1 | /* |
2 | * | ||
3 | * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. | 2 | * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. |
4 | * All Rights Reserved. | 3 | * All Rights Reserved. |
5 | * | 4 | * |
@@ -23,7 +22,7 @@ | |||
23 | * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE | 22 | * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE |
24 | * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 23 | * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
25 | * | 24 | * |
26 | **************************************************************************/ | 25 | */ |
27 | 26 | ||
28 | #ifndef _I915_DRM_H_ | 27 | #ifndef _I915_DRM_H_ |
29 | #define _I915_DRM_H_ | 28 | #define _I915_DRM_H_ |
@@ -152,6 +151,7 @@ typedef struct drm_i915_irq_wait { | |||
152 | */ | 151 | */ |
153 | #define I915_PARAM_IRQ_ACTIVE 1 | 152 | #define I915_PARAM_IRQ_ACTIVE 1 |
154 | #define I915_PARAM_ALLOW_BATCHBUFFER 2 | 153 | #define I915_PARAM_ALLOW_BATCHBUFFER 2 |
154 | #define I915_PARAM_LAST_DISPATCH 3 | ||
155 | 155 | ||
156 | typedef struct drm_i915_getparam { | 156 | typedef struct drm_i915_getparam { |
157 | int param; | 157 | int param; |