drm/i915: Trim set_timer_ms() intervals

Use the plain msec_to_jiffies() rather than the _timeout variant so we
round down and do not add an extra jiffy to our interval. For example,
with timeslicing we do not want to err on the longer side as any
fairness depends on catching hogging contexts on the GPU. Bring on
CFS.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200604135938.3975-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c
index 3e35a45d62182c2bf5ef2eea003ab3b596cb1ab2..67d74e6432a8a125114515073ad980137fce0aee 100644 (file)
--- a/drivers/gpu/drm/i915/gt/selftest_lrc.c
+++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c
@@ -1140,9 +1140,17 @@ static struct i915_request *nop_request(struct intel_engine_cs *engine)
        return rq;
 }
 
-static long timeslice_threshold(const struct intel_engine_cs *engine)
+static long slice_timeout(struct intel_engine_cs *engine)
 {
-       return 2 * msecs_to_jiffies_timeout(timeslice(engine)) + 1;
+       long timeout;
+
+       /* Enough time for a timeslice to kick in, and kick out */
+       timeout = 2 * msecs_to_jiffies_timeout(timeslice(engine));
+
+       /* Enough time for the nop request to complete */
+       timeout += HZ / 5;
+
+       return timeout + 1;
 }
 
 static int live_timeslice_queue(void *arg)
@@ -1260,7 +1268,7 @@ static int live_timeslice_queue(void *arg)
                }
 
                /* Timeslice every jiffy, so within 2 we should signal */
-               if (i915_request_wait(rq, 0, timeslice_threshold(engine)) < 0) {
+               if (i915_request_wait(rq, 0, slice_timeout(engine)) < 0) {
                        struct drm_printer p =
                                drm_info_printer(gt->i915->drm.dev);
 
@@ -1379,7 +1387,7 @@ static int live_timeslice_nopreempt(void *arg)
                 * allow the maximum priority barrier through. Wait long
                 * enough to see if it is timesliced in by mistake.
                 */
-               if (i915_request_wait(rq, 0, timeslice_threshold(engine)) >= 0) {
+               if (i915_request_wait(rq, 0, slice_timeout(engine)) >= 0) {
                        pr_err("%s: I915_PRIORITY_BARRIER request completed, bypassing no-preempt request\n",
                               engine->name);
                        err = -EINVAL;
@@ -3890,19 +3898,6 @@ static int live_virtual_mask(void *arg)
        return 0;
 }
 
-static long slice_timeout(struct intel_engine_cs *engine)
-{
-       long timeout;
-
-       /* Enough time for a timeslice to kick in, and kick out */
-       timeout = 2 * msecs_to_jiffies_timeout(timeslice(engine));
-
-       /* Enough time for the nop request to complete */
-       timeout += HZ / 5;
-
-       return timeout;
-}
-
 static int slicein_virtual_engine(struct intel_gt *gt,
                                  struct intel_engine_cs **siblings,
                                  unsigned int nsibling)

diff --git a/drivers/gpu/drm/i915/i915_utils.c b/drivers/gpu/drm/i915/i915_utils.c
index e28eae4a8f70626b39774d28ce718255e2f85455..f42a9e9a0b4fbac9525b6bdc990c93c771713a27 100644 (file)
--- a/drivers/gpu/drm/i915/i915_utils.c
+++ b/drivers/gpu/drm/i915/i915_utils.c
@@ -91,7 +91,7 @@ void set_timer_ms(struct timer_list *t, unsigned long timeout)
                return;
        }
 
-       timeout = msecs_to_jiffies_timeout(timeout);
+       timeout = msecs_to_jiffies(timeout);
 
        /*
         * Paranoia to make sure the compiler computes the timeout before