diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2020-04-03 08:36:57 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-04-03 16:33:09 +0100 |
| commit | bfae03fe75eb8875396184bd3bf15a52bea04956 (patch) | |
| tree | 452f869b18122bb73c6ecc1da31f5278f5cf2bc4 | |
| parent | 43acd6516ca970c7a1d9d4e3e1d85bf570abc190 (diff) | |
| download | lwn-bfae03fe75eb8875396184bd3bf15a52bea04956.tar.gz lwn-bfae03fe75eb8875396184bd3bf15a52bea04956.zip | |
drm/i915: Avoid setting timer->expires to 0
We use timer->expires == 0 to detect if a timer had been cancelled, but
it's a valid expiration we could set. Just skip using 0 and set the
expiry for the next jiffie.
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/20200403073657.13427-1-chris@chris-wilson.co.uk
| -rw-r--r-- | drivers/gpu/drm/i915/i915_utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_utils.c b/drivers/gpu/drm/i915/i915_utils.c index 029854ae65fc..e28eae4a8f70 100644 --- a/drivers/gpu/drm/i915/i915_utils.c +++ b/drivers/gpu/drm/i915/i915_utils.c @@ -101,5 +101,6 @@ void set_timer_ms(struct timer_list *t, unsigned long timeout) */ barrier(); - mod_timer(t, jiffies + timeout); + /* Keep t->expires = 0 reserved to indicate a canceled timer. */ + mod_timer(t, jiffies + timeout ?: 1); } |