diff options
author | Dave Airlie <airlied@redhat.com> | 2008-09-26 15:37:21 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2008-09-30 14:13:49 +1000 |
commit | 972f6572652bc4a2f6c44c525e5e91f2becdb62a (patch) | |
tree | 60af3dc7e8a7c0f8bef7a3927dae161093b10dbe /shared-core/i915_drv.h | |
parent | 89126bb58ec82511758bed36a28e698b721fb435 (diff) | |
parent | 2db8e0c8ef8c7a66460fceda129533b364f6418c (diff) |
Merge remote branch 'origin/master' into modesetting-gem
Conflicts:
libdrm/Makefile.am
libdrm/dri_bufmgr.h
linux-core/drm_irq.c
linux-core/drm_sysfs.c
linux-core/drm_ttm.c
shared-core/i915_dma.c
shared-core/i915_irq.c
shared-core/nouveau_drv.h
shared-core/radeon_cp.c
Diffstat (limited to 'shared-core/i915_drv.h')
-rw-r--r-- | shared-core/i915_drv.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index 04062c45..c420f3c9 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -43,6 +43,7 @@ #if defined(__linux__) #define I915_HAVE_BUFFER +#define I915_HAVE_GEM #endif /* Interface history: @@ -301,8 +302,9 @@ struct drm_i915_private { u8 saveCR[37]; struct { +#ifdef __linux__ struct drm_mm gtt_space; - +#endif /** * List of objects currently involved in rendering from the * ringbuffer. @@ -335,7 +337,7 @@ struct drm_i915_private { * outstanding. */ struct list_head request_list; - +#ifdef __linux__ /** * We leave the user IRQ off as much as possible, * but this means that requests will finish and never @@ -344,7 +346,7 @@ struct drm_i915_private { * fires, go retire requests. */ struct delayed_work retire_work; - +#endif uint32_t next_gem_seqno; /** @@ -501,6 +503,7 @@ extern int i915_dma_cleanup(struct drm_device *dev); extern int i915_dispatch_batchbuffer(struct drm_device * dev, drm_i915_batchbuffer_t * batch); extern int i915_quiescent(struct drm_device *dev); +extern void i915_free_hardware_status(struct drm_device *dev); int i915_emit_box(struct drm_device * dev, struct drm_clip_rect __user * boxes, @@ -610,8 +613,6 @@ extern unsigned int i915_fbpercrtc; void i915_gem_detect_bit_6_swizzle(struct drm_device *dev); /* i915_gem_debug.c */ -void i915_gem_dump_object(struct drm_gem_object *obj, int len, - const char *where, uint32_t mark); #if WATCH_INACTIVE void i915_verify_inactive(struct drm_device *dev, char *file, int line); #else |