On Mon, Jul 03, 2017 at 09:16:54AM +0100, Chris Wilson wrote: > Quoting Daniel Vetter (2017-07-03 09:03:36) > > On Fri, Jun 30, 2017 at 5:39 PM, Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> wrote: > > >> Yeah, but my point is that this here is an extremely fancy and fragile > > >> (and afaics in this form, incomplete) fix for something that in the past > > >> was fixed much, much simpler. Why do we need this massive amount of > > >> complexity now? Who's asking for all this (we don't even have anyone yet > > >> asking for fully queued atomic commits, much less on gen4)? > > > > > > It was never "fixed", it was always borked; broken by design. > > > > Hm, what was broken by design in gen3/4 reset? We never bothered to > > resubmit rendering when the gpu died, but besides that I'm not aware > > of a deisgn issue in that logic. We nuked in-flight pageflips (and > > restored those), and we stalled for any pending modesets (grabbing > > locks did that since all modesets where blocking), and that made sure > > the hw was in a consistent state. > > KMS reset was taking mutexes within reset without any means of breaking the > inherent deadlock, instead relying on something else to magically fix > it. We only ever engineered around struct_mutex for reset, the remains > of the deadlock upon struct_mutex within modeset is an issue but not the > one causing trouble here. So on the kms side we've had: - grab kms locks -> grab struct_mutex -> wait for rendering - on the reset side we've had the same order afair, with the caveat that we've broken the "wait for rendering" complete before trying to grab any of the locks in the reset path. I thought that the problem is that gpu reset stopping force-completing everything asap, which then lead the kms side to time-out at a point where it shouldn't and start to fall over. So before commit 221fe7994554cc3985fc5d761ed7e44dcae0fa52 Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> Date: Fri Sep 9 14:11:51 2016 +0100 drm/i915: Perform a direct reset of the GPU from the waiter what was the deadlock we've had? Besides breaking the "wait for rendering" I don't remember any inversions we've had. And for the breaking we've had a fairly complex dance of barriers and reset_in_progress and waking up waiters to make sure it would catch them all ... > Please do note the bugs that indicate that even without modeset reset, > hw is not in a consistent state. So there's more bugs, not sure how that is relevant for gpu reset? -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch