diff options
| author | Ben Widawsky | 2012-01-26 00:39:34 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2012-01-26 11:19:19 +0100 |
| commit | b93f9cf14e714c20ce9a544ed1a6070ee7604588 (patch) | |
| tree | bbf78a595254e96d88206bb60f400ae907a561f0 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | drm/i915: Correct the bit number for the MI_FLUSH_ENABLE. (diff) | |
| download | kernel-qcow2-linux-b93f9cf14e714c20ce9a544ed1a6070ee7604588.tar.gz kernel-qcow2-linux-b93f9cf14e714c20ce9a544ed1a6070ee7604588.tar.xz kernel-qcow2-linux-b93f9cf14e714c20ce9a544ed1a6070ee7604588.zip | |
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.h | 5 |
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, unsigned long start, unsigned long mappable_end, unsigned long end); -int __must_check i915_gpu_idle(struct drm_device *dev); +int __must_check i915_gpu_idle(struct drm_device *dev, bool do_retire); int __must_check i915_gem_idle(struct drm_device *dev); int __must_check i915_add_request(struct intel_ring_buffer *ring, struct drm_file *file, struct drm_i915_gem_request *request); int __must_check i915_wait_request(struct intel_ring_buffer *ring, - uint32_t seqno); + uint32_t seqno, + bool do_retire); int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf); int __must_check i915_gem_object_set_to_gtt_domain(struct drm_i915_gem_object *obj, |