Pre-nv50 has all sorts of funny requirements for non-copy alu operations, and will bail out of solid fills left and right. Account for that case and fall back to the memset. Reported-by: Andrew Randrianasulu <randrianasulu at gmail.com> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> --- src/drmmode_display.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 7c1d2bb..2ca1dba 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -410,12 +410,15 @@ drmmode_fbcon_copy(ScreenPtr pScreen) fallback: if (pdpix) { - pNv->EXADriverPtr->PrepareSolid(pdpix, GXclear, ~0, 0); - pNv->EXADriverPtr->Solid(pdpix, 0, 0, w, h); - pNv->EXADriverPtr->DoneSolid(pdpix); - nouveau_bo_wait(pNv->scanout, NOUVEAU_BO_RDWR, pNv->client); + if (exa->PrepareSolid(pdpix, GXclear, ~0, 0)) { + exa->Solid(pdpix, 0, 0, w, h); + exa->DoneSolid(pdpix); + PUSH_KICK(pNv->pushbuf); + nouveau_bo_wait(pNv->scanout, NOUVEAU_BO_RDWR, pNv->client); + pScreen->DestroyPixmap(pdpix); + return; + } pScreen->DestroyPixmap(pdpix); - return; } #endif if (nouveau_bo_map(pNv->scanout, NOUVEAU_BO_WR, pNv->client)) -- 2.3.6
Ilia Mirkin
2015-May-19 20:28 UTC
[Nouveau] [PATCH 2/2] nv04-nv40: don't attempt to do 32-bit shifts
A 32-bit shift is a no-op, which will also make the new planemask get or'd with ~0, thus negating the usefulness of the subsequent planemask != ~0 check. Only do this if it's a less-than-32-bit per pixel format, in which case it will have the desired effect of setting the high bits. Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> --- src/nv04_exa.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nv04_exa.c b/src/nv04_exa.c index 7a58dd7..d5dec68 100644 --- a/src/nv04_exa.c +++ b/src/nv04_exa.c @@ -49,7 +49,8 @@ NV04EXASetROP(PixmapPtr ppix, int subc, int mthd, int alu, Pixel planemask) NVPtr pNv = NVPTR(pScrn); struct nouveau_pushbuf *push = pNv->pushbuf; - planemask |= ~0 << ppix->drawable.bitsPerPixel; + if (ppix->drawable.bitsPerPixel < 32) + planemask |= ~0 << ppix->drawable.bitsPerPixel; if (planemask != ~0 || alu != GXcopy) { if (ppix->drawable.bitsPerPixel == 32) return FALSE; -- 2.3.6
Martin Peres
2015-May-19 20:35 UTC
[Nouveau] [PATCH 2/2] nv04-nv40: don't attempt to do 32-bit shifts
On 19/05/15 23:28, Ilia Mirkin wrote:> A 32-bit shift is a no-op, which will also make the new planemask get > or'd with ~0, thus negating the usefulness of the subsequent > planemask != ~0 check. Only do this if it's a less-than-32-bit per pixel > format, in which case it will have the desired effect of setting the > high bits. > > Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> > --- > src/nv04_exa.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/src/nv04_exa.c b/src/nv04_exa.c > index 7a58dd7..d5dec68 100644 > --- a/src/nv04_exa.c > +++ b/src/nv04_exa.c > @@ -49,7 +49,8 @@ NV04EXASetROP(PixmapPtr ppix, int subc, int mthd, int alu, Pixel planemask) > NVPtr pNv = NVPTR(pScrn); > struct nouveau_pushbuf *push = pNv->pushbuf; > > - planemask |= ~0 << ppix->drawable.bitsPerPixel; > + if (ppix->drawable.bitsPerPixel < 32) > + planemask |= ~0 << ppix->drawable.bitsPerPixel; > if (planemask != ~0 || alu != GXcopy) { > if (ppix->drawable.bitsPerPixel == 32) > return FALSE;Both patches look good to me. Thanks for tracking those bugs down :) Reviewed-by: Martin Peres <martin.peres at free.fr>