[Intel-gfx] [PATCH 2/2] drm/i915: drop the guard page at the end of the gtt

[Daniel Vetter]

On Mon, Jan 30, 2012 at 08:14:21PM +0100, Daniel Vetter wrote:
> On Mon, Jan 30, 2012 at 11:09:01AM -0800, Eric Anholt wrote:
> > On Mon, 30 Jan 2012 16:55:49 +0100, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> > > Chris Wilson reported that with a bunch of patches to no longer force
> > > batchbuffer (in most cases at least) into the mappable part of gtt
> > > that his Pineview died while prefetching the last page of the gtt.
> > > 
> > > Turns out that since my intel-gtt rewrite we don't actually put a
> > > dummy pte in that last page anymore. Which left me rather puzzled
> > > because Chris' error_state was the first ever since that rewrite that
> > > indicated a dead gpu due to prefetch.
> > > 
> > > So I've gone ahead and created the gem_cs_prefetch testcase which
> > > reliably manages to execute a batch on the last page. Of all the
> > > machines Chris and I have tried this on only his Pineview fell over,
> > > all the others handled the invalid pte right after the end of the
> > > batch correctly.
> > > 
> > > The other thing is that due to my intel-gtt we've also started to use
> > > the non-mappable part of the gtt. So my theory is that this guard page
> > > was only necessary when we didn't use and hence also didn't set up any
> > > dummy ptes to the scratch page in that area. In that case the cs would
> > > prefetch into the unmappable gtt area and fail over on the invalid
> > > pte.
> > > 
> > > So given that this guard page smells like it just duct-taped over an
> > > issue in our code I've simply removed it. And this seems to work!
> > > 
> > > Now we always run the risk that an odd machine we don't have in our
> > > test labs needs this, but
> > > - we now have an excellent testcase to diagnose any such issues
> > > - and the patch is easy to revert.
> > > Hence I prefer if we try to get rid of this.
> > 
> > I like the theory about invalid ptes -- makes sense to me.  I'm still a
> > little confused: Does the pineview still fail after this patch, and
> > would just making the hunk do what it meant to again fix it?
> 
> The pineview happily works when we use the entire gtt and doesn't fall
> over when executing a batch in the very last page (as opposed to a batch
> in the 2nd last page with the last one having an invalid pte). Just making
> the code do again what it claims to do would do the trick, too.
> 
> But I'd like to get rid of the scratch ptes long-term so that we can make
> good use of the resulting pagefaults for debugging stray writes (at least
> on newer generations). This here is one step - but the big part isn't
> really the patch but creating a test-case for the cs prefetcher so that we
> can actually check things in a reliable, reproducible and quick way.
> 
> I'll clarify the commit msg to say more explicitly that pnv works with
> this.

Might as well clarify completely on the testing this got: Tested with
i-g-t/tests/gem_cs_prefetch on ivb, snb, ilk, g33, i915g, i855gm by me.
I'll also test this on a freshly ebayed gm45 which should arrive this week
and my i945gme netbook as soon as I've resurrected grub on that one.
Tested by Chris on his pnv and i965gm. That's only about half of all the
chip versions we support, but about as good as it gets.
-Daniel
-- 
Daniel Vetter
Mail: daniel at ffwll.ch
Mobile: +41 (0)79 365 57 48