]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915/gt: Restore dropped 'interruptible' flag
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 6 Oct 2019 16:49:53 +0000 (17:49 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 7 Oct 2019 12:51:59 +0000 (13:51 +0100)
Lost in the rebasing was Tvrtko's reminder that we need to keep an
uninterruptible wait around for the Ironlake VT-d w/a

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191006165002.30312-3-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/gt/intel_gt_requests.c

index 8aed89fd2cdc17846dd17dab53314b466da9256b..d69e78478eeac9b31115ece39a6f8fea9e7420fa 100644 (file)
@@ -48,7 +48,7 @@ long intel_gt_retire_requests_timeout(struct intel_gt *gt, long timeout)
                        fence = i915_active_fence_get(&tl->last_request);
                        if (fence) {
                                timeout = dma_fence_wait_timeout(fence,
-                                                                true,
+                                                                interruptible,
                                                                 timeout);
                                dma_fence_put(fence);
                        }