From: Daniel Vetter Date: Mon, 23 Feb 2015 11:03:28 +0000 (+0100) Subject: drm/i915: Remove irq-related FIXME in reset code X-Git-Tag: firefly_0821_release~176^2~1470^2~58^2~351 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9393943be66abb3131d06f43dbd94538733e1aa6;p=firefly-linux-kernel-4.4.55.git drm/i915: Remove irq-related FIXME in reset code With the two-step reset counter increments which braket the actual reset code and the subsequent wake-up we're guaranteeing that all the lockless waiters _will_ be woken up. And since we unconditionally bail out of waits with -EAGAIN (or -EIO) in that case there is not risk of lost interrupt enabling bits when the lockless wait code races against a gpu reset. Let's remove this FIXME as resolved then. Signed-off-by: Daniel Vetter Reviewed-by: Rodrigo Vivi Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 0001642c38b4..15f58d02acda 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -881,12 +881,6 @@ int i915_reset(struct drm_device *dev) return ret; } - /* - * FIXME: This races pretty badly against concurrent holders of - * ring interrupts. This is possible since we've started to drop - * dev->struct_mutex in select places when waiting for the gpu. - */ - /* * rps/rc6 re-init is necessary to restore state lost after the * reset and the re-install of gt irqs. Skip for ironlake per