From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Skeggs Subject: Re: [PATCH] nouveau: avoid running out of relocs Date: Sat, 05 Dec 2009 09:32:54 +1000 Message-ID: <1259969574.2897.1.camel@nisroch> References: <1259963980-6698-1-git-send-email-madman2003@gmail.com> Reply-To: skeggsb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1259963980-6698-1-git-send-email-madman2003-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org To: Maarten Maathuis Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org NACK. You'll want to do this once, at the start of nv50_state_emit(), if we run out *during* state_emit() something's gone very wrong, and we'd need to fallback to software as the DDX does. Having the flush occur mid-frame will cause other issues. Ben. On Fri, 2009-12-04 at 22:59 +0100, Maarten Maathuis wrote: > Signed-off-by: Maarten Maathuis > --- > src/gallium/drivers/nouveau/nouveau_stateobj.h | 12 ++++++++---- > 1 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/src/gallium/drivers/nouveau/nouveau_stateobj.h b/src/gallium/drivers/nouveau/nouveau_stateobj.h > index b595405..28f483f 100644 > --- a/src/gallium/drivers/nouveau/nouveau_stateobj.h > +++ b/src/gallium/drivers/nouveau/nouveau_stateobj.h > @@ -113,8 +113,10 @@ so_emit(struct nouveau_channel *chan, struct nouveau_stateobj *so) > unsigned nr, i; > > nr = so->cur - so->push; > - if (pb->remaining < nr) > - nouveau_pushbuf_flush(chan, nr); > + /* This will flush if we need space. > + * We don't actually need the marker. > + */ > + nouveau_pushbuf_marker_emit(chan, nr, so->cur_reloc); > pb->remaining -= nr; > > memcpy(pb->cur, so->push, nr * 4); > @@ -138,8 +140,10 @@ so_emit_reloc_markers(struct nouveau_channel *chan, struct nouveau_stateobj *so) > return; > > i = so->cur_reloc << 1; > - if (pb->remaining < i) > - nouveau_pushbuf_flush(chan, i); > + /* This will flush if we need space. > + * We don't actually need the marker. > + */ > + nouveau_pushbuf_marker_emit(chan, i, i); > pb->remaining -= i; > > for (i = 0; i < so->cur_reloc; i++) {