From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [Intel-gfx] [PATCH v2] drm/i915: Don't clobber crtc->fb when queue_flip fails Date: Mon, 4 Mar 2013 14:47:37 +0200 Message-ID: <20130304124737.GG4469@intel.com> References: <1361544818-23408-1-git-send-email-ville.syrjala@linux.intel.com> <20130222151300.GH23278@cantiga.alporthouse.com> <20130303185233.GS9021@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <20130303185233.GS9021@phenom.ffwll.local> Sender: stable-owner@vger.kernel.org To: Daniel Vetter Cc: Chris Wilson , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org On Sun, Mar 03, 2013 at 07:52:33PM +0100, Daniel Vetter wrote: > On Fri, Feb 22, 2013 at 03:13:00PM +0000, Chris Wilson wrote: > > On Fri, Feb 22, 2013 at 04:53:38PM +0200, ville.syrjala@linux.intel= =2Ecom wrote: > > > From: Ville Syrj=E4l=E4 > > >=20 > > > Restore crtc->fb to the old framebuffer if queue_flip fails. > > >=20 > > > While at it, kill the pointless intel_fb temp variable. > > >=20 > > > v2: Update crtc->fb before queue_flip and restore it back > > > after a failure. > > >=20 > > > Cc: stable@vger.kernel.org > > > Signed-off-by: Ville Syrj=E4l=E4 > >=20 > > Lgtm, either v1 or v2 gets my > > Reviewed-by: Chris Wilson > > (with a slight preference towards v2 for the sake of paranoia) >=20 > Picked up for -fixes, thanks for the patch. And can I wish for an i-g= -t > for this? Hmm. I think it's a bit difficult to hit it systematically due to a GPU reset. We need to call queue_flip after a hang was detected but before the reset work has a chance to run. But after a bit more though we should hit the same bug by trying to flip to a Y-tiled buffer. I'll try to make a test based on that. --=20 Ville Syrj=E4l=E4 Intel OTC