Commit eef24f11 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Jani Nikula
Browse files

drm/i915: Take request reference before arming the watchdog timer 



Reference needs to be taken before arming the timer. Luckily, given the
default timer period of 20s, the potential to hit the race is extremely
unlikely.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: 9b4d0598 ("drm/i915: Request watchdog infrastructure")
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210326105759.2387104-1-tvrtko.ursulin@linux.intel.com


(cherry picked from commit f7c37977)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent e65a4d37

drivers/gpu/drm/i915/i915_request.c

+2 −1
Original line number Diff line number Diff line
@@ -350,6 +350,8 @@ static void __rq_arm_watchdog(struct i915_request *rq) 
	if (!ce->watchdog.timeout_us)

		return;



	i915_request_get(rq);



	hrtimer_init(&wdg->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);

	wdg->timer.function = __rq_watchdog_expired;

	hrtimer_start_range_ns(&wdg->timer,
@@ -357,7 +359,6 @@ static void __rq_arm_watchdog(struct i915_request *rq) 
					   NSEC_PER_USEC),

			       NSEC_PER_MSEC,

			       HRTIMER_MODE_REL);

	i915_request_get(rq);

}



static void __rq_cancel_watchdog(struct i915_request *rq)