From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH] drm/i915: fixup hangman rebase goof-up Date: Sat, 16 Jun 2012 15:57:23 +0100 Message-ID: <1339858660_30709@CP5-2952> References: <1339857725-9716-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from fireflyinternet.com (smtp.fireflyinternet.com [109.228.6.236]) by gabe.freedesktop.org (Postfix) with ESMTP id 789BB9E79F for ; Sat, 16 Jun 2012 08:34:18 -0700 (PDT) In-Reply-To: <1339857725-9716-1-git-send-email-daniel.vetter@ffwll.ch> 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 Graphics Development Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org On Sat, 16 Jun 2012 16:42:05 +0200, Daniel Vetter wrote: > I've added a bit of logic such that running the hangman test on chips > without any hw reset support at all doesn't wedge the gpu because the > reset failed. This relied on checking for non-null stop_rings. > Unfortunately I've botched a rebase somewhere and stop_rings is still > cleared at the old place before the reset code. > > Fix this up so that running the i-g-t tests on gen2/3 doesn't result > in a wedged gpu. dev_priv->stop_rings = 0; is there on both dif and dinq. An unpushed mistake perhaps? -Chris -- Chris Wilson, Intel Open Source Technology Centre