aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2012-01-25 18:39:34 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-01-26 05:19:19 -0500
commitb93f9cf14e714c20ce9a544ed1a6070ee7604588 (patch)
treebbf78a595254e96d88206bb60f400ae907a561f0 /drivers/gpu/drm/i915/i915_drv.h
parentfc74d8e01165b567922921d110b6d16320a61fa6 (diff)
drm/i915: argument to control retiring behavior
Sometimes it may be the case when we idle the gpu or wait on something we don't actually want to process the retiring list. This patch allows callers to choose the behavior. Reviewed-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com> Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index f02a5f525f03..1d10b8c26c98 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1179,13 +1179,14 @@ void i915_gem_do_init(struct drm_device *dev,
1179 unsigned long start, 1179 unsigned long start,
1180 unsigned long mappable_end, 1180 unsigned long mappable_end,
1181 unsigned long end); 1181 unsigned long end);
1182int __must_check i915_gpu_idle(struct drm_device *dev); 1182int __must_check i915_gpu_idle(struct drm_device *dev, bool do_retire);
1183int __must_check i915_gem_idle(struct drm_device *dev); 1183int __must_check i915_gem_idle(struct drm_device *dev);
1184int __must_check i915_add_request(struct intel_ring_buffer *ring, 1184int __must_check i915_add_request(struct intel_ring_buffer *ring,
1185 struct drm_file *file, 1185 struct drm_file *file,
1186 struct drm_i915_gem_request *request); 1186 struct drm_i915_gem_request *request);
1187int __must_check i915_wait_request(struct intel_ring_buffer *ring, 1187int __must_check i915_wait_request(struct intel_ring_buffer *ring,
1188 uint32_t seqno); 1188 uint32_t seqno,
1189 bool do_retire);
1189int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf); 1190int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
1190int __must_check 1191int __must_check
1191i915_gem_object_set_to_gtt_domain(struct drm_i915_gem_object *obj, 1192i915_gem_object_set_to_gtt_domain(struct drm_i915_gem_object *obj,