From mboxrd@z Thu Jan 1 00:00:00 1970 From: Francisco Jerez Subject: [PATCHv2] nv04-nv40/exa: Match the blob behavior more closely on PrepareCopy. Date: Fri, 6 Nov 2009 16:14:40 +0100 Message-ID: <1257520480-18855-1-git-send-email-currojerez@riseup.net> References: <1256171762-666-1-git-send-email-currojerez@riseup.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1256171762-666-1-git-send-email-currojerez-sGOZH3hwPm2sTnJN9+BGXg@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: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org Fix a somewhat indeterministic corruption problem on nv17 when there is stuff going on the other fifos (e.g. gallium but I've also reproduced it with an app just SIFM-ing memory around): in some cases it made the blits the X server had scheduled fail corrupting the nearby screen areas. Signed-off-by: Francisco Jerez --- src/nv04_exa.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/nv04_exa.c b/src/nv04_exa.c index 71a4ac2..f4966a4 100644 --- a/src/nv04_exa.c +++ b/src/nv04_exa.c @@ -209,10 +209,16 @@ NV04EXAPrepareCopy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int dx, int dy, MARK_UNDO(chan); return FALSE; } + + BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_SURFACE, 1); + OUT_RING (chan, pNv->NvContextSurfaces->handle); BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_OPERATION, 1); OUT_RING (chan, 1); /* ROP_AND */ + NV04EXASetROP(pScrn, alu, planemask); } else { + BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_SURFACE, 1); + OUT_RING (chan, pNv->NvContextSurfaces->handle); BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_OPERATION, 1); OUT_RING (chan, 3); /* SRCCOPY */ } -- 1.6.4.4