]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915/gt: Remove uninterruptible parameter from intel_gt_wait_for_idle
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 9 Dec 2020 16:40:08 +0000 (16:40 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 9 Dec 2020 19:43:32 +0000 (19:43 +0000)
Now that the only user of the uninterruptible wait was eliminated,
remove the support.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201209164008.5487-3-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/gt/intel_gt_requests.c

index 66fcbf9d0fdd3735c72432060f5de10fdaf794c8..dc06c78c9eebca3898e2c3355b457e42f55f90fb 100644 (file)
@@ -135,13 +135,8 @@ long intel_gt_retire_requests_timeout(struct intel_gt *gt, long timeout)
        struct intel_gt_timelines *timelines = &gt->timelines;
        struct intel_timeline *tl, *tn;
        unsigned long active_count = 0;
-       bool interruptible;
        LIST_HEAD(free);
 
-       interruptible = true;
-       if (unlikely(timeout < 0))
-               timeout = -timeout, interruptible = false;
-
        flush_submission(gt, timeout); /* kick the ksoftirqd tasklets */
        spin_lock(&timelines->lock);
        list_for_each_entry_safe(tl, tn, &timelines->active_list, link) {
@@ -163,7 +158,7 @@ long intel_gt_retire_requests_timeout(struct intel_gt *gt, long timeout)
                                mutex_unlock(&tl->mutex);
 
                                timeout = dma_fence_wait_timeout(fence,
-                                                                interruptible,
+                                                                true,
                                                                 timeout);
                                dma_fence_put(fence);