From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 1/2] drm/i915: Kill i915_gem_execbuffer_wait_for_flips() Date: Wed, 31 Oct 2012 21:17:27 +0200 Message-ID: <20121031191726.GK3791@intel.com> References: <1351705121-17627-1-git-send-email-ville.syrjala@linux.intel.com> <1351705121-17627-2-git-send-email-ville.syrjala@linux.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 9064C9E81F for ; Wed, 31 Oct 2012 12:17:30 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1351705121-17627-2-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, Oct 31, 2012 at 07:38:40PM +0200, ville.syrjala@linux.intel.com wro= te: > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/= intel_display.c > index cbc0035..83e16f8 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -2177,8 +2177,7 @@ intel_finish_fb(struct drm_framebuffer *old_fb) > int ret; > = > wait_event(dev_priv->pending_flip_queue, > - atomic_read(&dev_priv->mm.wedged) || > - atomic_read(&obj->pending_flip) =3D=3D 0); > + atomic_read(&dev_priv->mm.wedged)); And of course this bit is total nonsense now. I had the logic inverted in my mind. So this guy actually wants to stop waiting when the GPU hangs, not the other way around. So I need to drop the whole wait_event() here. Stand by for v2... -- = Ville Syrj=E4l=E4 Intel OTC