On Wed, Jul 03, 2013 at 12:13:44PM +0100, Chris Wilson wrote: > On Wed, Jul 03, 2013 at 12:56:54PM +0200, Daniel Vetter wrote: > > This fixes gpu reset on my gm45 - without this patch the bsd thing is > > forever stuck since the seqno updates never reach the status page. > > > > Tbh I have no idea how this ever worked without rewriting the hws > > registers after a gpu reset. > > > > To satisfy my OCD also give the functions a bit more consistent names: > > - Use status_page everywhere, also for the physical addressed one. > > - Use init for the allocation part and setup for the register setup > > part consistently. > > > > Long term I'd really like to share the hw init parts completely > > between gpu reset, resume and driver load, i.e. to call > > i915_gem_init_hw instead of the individual pieces we might need. > > > > v2: Add the missing paragraph to the commit message about what bug > > exactly this patch here fixes. > > > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65495 > > Cc: Chris Wilson <chris at chris-wilson.co.uk> > > Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch> > > Lots of low hanging fruit here for designating the phases of > initialisation and what is required for reinitialisation, definitely > requires a good renaming session and cleanup. > > Well, I was hoping that this would also help bug 64725, but alas upon > resume we do the full init, rather than the shortcut for reset. > > Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk> Picked up for -fixes, thanks for the review. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch