Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 168c3f21 authored by Mika Kuoppala's avatar Mika Kuoppala Committed by Daniel Vetter
Browse files

drm/i915: dont call irq_put when irq test is on 



If test is running, irq_get was not called so we should gain
balance by not doing irq_put

"So the rule is: if you access unlocked values, you use ACCESS_ONCE().
You don't say "but it can't matter". Because you simply don't know."
-- Linus

v2: use local variable so it can't change during test (Chris)

v3: update commit msg and use ACCESS_ONCE (Ville)

Signed-off-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 993495ae

drivers/gpu/drm/i915/i915_gem.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -1015,6 +1015,8 @@ static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno, 
			struct drm_i915_file_private *file_priv)

			struct drm_i915_file_private *file_priv)

{

{

	drm_i915_private_t *dev_priv = ring->dev->dev_private;

	drm_i915_private_t *dev_priv = ring->dev->dev_private;

	const bool irq_test_in_progress =

		ACCESS_ONCE(dev_priv->gpu_error.test_irq_rings) & intel_ring_flag(ring);

	struct timespec before, now;

	struct timespec before, now;

	DEFINE_WAIT(wait);

	DEFINE_WAIT(wait);

	unsigned long timeout_expire;

	unsigned long timeout_expire;
@@ -1035,8 +1037,7 @@ static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno, 
					 msecs_to_jiffies(100));

					 msecs_to_jiffies(100));

	}

	}





	if (!(dev_priv->gpu_error.test_irq_rings & intel_ring_flag(ring)) &&

	if (!irq_test_in_progress && WARN_ON(!ring->irq_get(ring)))

	    WARN_ON(!ring->irq_get(ring)))

		return -ENODEV;

		return -ENODEV;





	/* Record current time in case interrupted by signal, or wedged */

	/* Record current time in case interrupted by signal, or wedged */
@@ -1093,6 +1094,7 @@ static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno, 
	getrawmonotonic(&now);

	getrawmonotonic(&now);

	trace_i915_gem_request_wait_end(ring, seqno);

	trace_i915_gem_request_wait_end(ring, seqno);





	if (!irq_test_in_progress)

		ring->irq_put(ring);

		ring->irq_put(ring);





	finish_wait(&ring->irq_queue, &wait);

	finish_wait(&ring->irq_queue, &wait);