From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/i915: dont call irq_put when irq test is on Date: Thu, 12 Dec 2013 14:56:41 +0200 Message-ID: <20131212125640.GZ10036@intel.com> References: <1386614842-27821-1-git-send-email-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 92B80FA8B5 for ; Thu, 12 Dec 2013 04:56:50 -0800 (PST) Content-Disposition: inline In-Reply-To: <1386614842-27821-1-git-send-email-mika.kuoppala@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Mika Kuoppala Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, Dec 09, 2013 at 08:47:22PM +0200, Mika Kuoppala wrote: > If test is running, irq_get was not called so we should > gain balance by not doing irq_put > = > v2: use local variable so it can't change during test (Chris) > = > Signed-off-by: Mika Kuoppala > --- > drivers/gpu/drm/i915/i915_gem.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_= gem.c > index 92149bc..ab8fd3d 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -1015,6 +1015,7 @@ static int __wait_seqno(struct intel_ring_buffer *r= ing, u32 seqno, > struct drm_i915_file_private *file_priv) > { > drm_i915_private_t *dev_priv =3D ring->dev->dev_private; > + const bool irq_test_in_progress =3D dev_priv->gpu_error.test_irq_rings = & intel_ring_flag(ring); Should this use ACCESS_ONCE() to make sure the value doesn't get reloaded from the source later? > struct timespec before, now; > DEFINE_WAIT(wait); > long timeout_jiffies; > @@ -1035,8 +1036,7 @@ static int __wait_seqno(struct intel_ring_buffer *r= ing, u32 seqno, > msecs_to_jiffies(100)); > } > = > - if (!(dev_priv->gpu_error.test_irq_rings & intel_ring_flag(ring)) && > - WARN_ON(!ring->irq_get(ring))) > + if (!irq_test_in_progress && WARN_ON(!ring->irq_get(ring))) > return -ENODEV; > = > /* Record current time in case interrupted by signal, or wedged */ > @@ -1095,7 +1095,8 @@ static int __wait_seqno(struct intel_ring_buffer *r= ing, u32 seqno, > getrawmonotonic(&now); > trace_i915_gem_request_wait_end(ring, seqno); > = > - ring->irq_put(ring); > + if (!irq_test_in_progress) > + ring->irq_put(ring); > = > finish_wait(&ring->irq_queue, &wait); > = > -- = > 1.7.9.5 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC