diff options
author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-01-15 17:52:59 -0500 |
---|---|---|
committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-01-15 17:52:59 -0500 |
commit | ba217b77772a16ad93c8534121b4859e731db384 (patch) | |
tree | ed45091c22d72284e3cebdc3124e2991e18db566 /drivers/gpu/drm/i915/i915_utils.c | |
parent | 777e687a0c6512179d7e333a633d4c6fa5046233 (diff) | |
parent | fb5cfcaa2efbb4c71abb1dfbc8f4da727e0bfd89 (diff) |
Merge drm/drm-next into drm-intel-next
Syncing drm-intel-next and drm-intel-gt-next to unblock ADL enabling.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_utils.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_utils.c b/drivers/gpu/drm/i915/i915_utils.c index 4c305d838016..f9e780dee9de 100644 --- a/drivers/gpu/drm/i915/i915_utils.c +++ b/drivers/gpu/drm/i915/i915_utils.c @@ -87,7 +87,7 @@ bool i915_error_injected(void) void cancel_timer(struct timer_list *t) { - if (!READ_ONCE(t->expires)) + if (!timer_active(t)) return; del_timer(t); |