summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem_gtt.c
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2012-01-25 15:39:34 -0800
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-01-26 11:19:19 +0100
commitb93f9cf14e714c20ce9a544ed1a6070ee7604588 (patch)
treebbf78a595254e96d88206bb60f400ae907a561f0 /drivers/gpu/drm/i915/i915_gem_gtt.c
parentfc74d8e01165b567922921d110b6d16320a61fa6 (diff)
downloadop-kernel-dev-b93f9cf14e714c20ce9a544ed1a6070ee7604588.zip
op-kernel-dev-b93f9cf14e714c20ce9a544ed1a6070ee7604588.tar.gz
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_gem_gtt.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem_gtt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 6042c5e..e050b90 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -55,7 +55,7 @@ static bool do_idling(struct drm_i915_private *dev_priv)
if (unlikely(dev_priv->mm.gtt->do_idle_maps)) {
dev_priv->mm.interruptible = false;
- if (i915_gpu_idle(dev_priv->dev)) {
+ if (i915_gpu_idle(dev_priv->dev, true)) {
DRM_ERROR("Couldn't idle GPU\n");
/* Wait a bit, in hopes it avoids the hang */
udelay(10);
OpenPOWER on IntegriCloud