Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755203Ab2HZSm1 (ORCPT ); Sun, 26 Aug 2012 14:42:27 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:48332 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754230Ab2HZSmZ (ORCPT ); Sun, 26 Aug 2012 14:42:25 -0400 Date: Sun, 26 Aug 2012 20:42:49 +0200 From: Daniel Vetter To: Sedat Dilek Cc: David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH drm-next 3/3] drm/i915/contexts: Fixup merge with commit b6c7488df68a Message-ID: <20120826184249.GC5194@phenom.ffwll.local> Mail-Followup-To: Sedat Dilek , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <1345846584-5910-1-git-send-email-sedat.dilek@gmail.com> <1345846584-5910-3-git-send-email-sedat.dilek@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1345846584-5910-3-git-send-email-sedat.dilek@gmail.com> X-Operating-System: Linux phenom 3.4.0-rc3+ User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1660 Lines: 50 On Sat, Aug 25, 2012 at 12:16:24AM +0200, Sedat Dilek wrote: > This is a fixup patch for the merge of drm-next into linux-next caused > by commit b6c7488df68a ("drm/i915/contexts: fix list corruption"). > > Reported-By: Stephen Rothwell > Signed-off-by: Sedat Dilek This is wrong, switch_context _must_ happen before ring_idle, otherwise all hell can break loose on resume. -Daniel > --- > drivers/gpu/drm/i915/i915_gem.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index 4f6841d..e8a5cb2 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -2273,11 +2273,11 @@ int i915_gpu_idle(struct drm_device *dev) > > /* Flush everything onto the inactive list. */ > for_each_ring(ring, dev_priv, i) { > - ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID); > + ret = i915_ring_idle(ring); > if (ret) > return ret; > > - ret = i915_ring_idle(ring); > + ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID); > if (ret) > return ret; > > -- > 1.7.9.5 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/