diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-10-04 16:40:04 +0300 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-10-04 17:39:23 +0300 |
| commit | f33a8a51602c84cc7d5cadd2655835ba3b7d03f9 (patch) | |
| tree | cf2bfc94c52a62afbf2738e0886a83b3d2053db4 /drivers/gpu/drm/i915/selftests/mock_gem_device.c | |
| parent | 33d856445b3ef6f00466cd9fbb04d69061143077 (diff) | |
| download | linux-f33a8a51602c84cc7d5cadd2655835ba3b7d03f9.tar.xz | |
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/selftests/mock_gem_device.c')
| -rw-r--r-- | drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c index a8be5da2b3cf..3b589bbb2c2d 100644 --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c @@ -44,7 +44,7 @@ void mock_device_flush(struct drm_i915_private *i915) do { for_each_engine(engine, i915, id) mock_engine_flush(engine); - } while (i915_retire_requests(i915)); + } while (i915_retire_requests_timeout(i915, MAX_SCHEDULE_TIMEOUT)); } static void mock_device_release(struct drm_device *dev) |