diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-10-04 14:40:04 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-10-04 15:39:23 +0100 |
| commit | f33a8a51602c84cc7d5cadd2655835ba3b7d03f9 (patch) | |
| tree | cf2bfc94c52a62afbf2738e0886a83b3d2053db4 /drivers/gpu/drm/i915/gem/i915_gem_pm.c | |
| parent | 33d856445b3ef6f00466cd9fbb04d69061143077 (diff) | |
| download | lwn-f33a8a51602c84cc7d5cadd2655835ba3b7d03f9.tar.gz lwn-f33a8a51602c84cc7d5cadd2655835ba3b7d03f9.zip | |
drm/i915: Merge wait_for_timelines with retire_request
wait_for_timelines is essentially the same loop as retiring requests
(with an extra timeout), so merge the two into one routine.
v2: i915_retire_requests_timeout and keep VT'd w/a as !interruptible
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-10-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/gem/i915_gem_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_pm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.c b/drivers/gpu/drm/i915/gem/i915_gem_pm.c index 26f325bbfe4d..90b211257f2d 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_pm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.c @@ -59,9 +59,7 @@ static bool switch_to_kernel_context_sync(struct intel_gt *gt) { bool result = !intel_gt_is_wedged(gt); - if (i915_gem_wait_for_idle(gt->i915, - I915_WAIT_FOR_IDLE_BOOST, - I915_GEM_IDLE_TIMEOUT) == -ETIME) { + if (i915_gem_wait_for_idle(gt->i915, I915_GEM_IDLE_TIMEOUT) == -ETIME) { /* XXX hide warning from gem_eio */ if (i915_modparams.reset) { dev_err(gt->i915->drm.dev, |