diff options
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 05145932482..31054fa44c4 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2273,11 +2273,11 @@ int i915_gpu_idle(struct drm_device *dev)  	/* Flush everything onto the inactive list. */  	for_each_ring(ring, dev_priv, i) { -		ret = i915_ring_idle(ring); +		ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID);  		if (ret)  			return ret; -		ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID); +		ret = i915_ring_idle(ring);  		if (ret)  			return ret;  	}  |