From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: fixup hangman rebase goof-up Date: Mon, 18 Jun 2012 10:37:05 +0200 Message-ID: <20120618083705.GC4773@phenom.ffwll.local> References: <1339859448_30750@CP5-2952> <1339864184-11363-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 mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id ECDA79EFEE for ; Mon, 18 Jun 2012 01:35:31 -0700 (PDT) Received: by wgbdr1 with SMTP id dr1so3980622wgb.12 for ; Mon, 18 Jun 2012 01:35:31 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1339864184-11363-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, Jun 16, 2012 at 06:29:44PM +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. > > v2: Actually remove the lines instead of adding them twice ... my git > license should be revoked immediately. > > Signed-Off-by: Daniel Vetter I've queued this one for -next. -Daniel -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48