search for: wait_r

...ELOCo(chan, dst_bo, NOUVEAU_BO_GART | NOUVEAU_BO_VRAM | NOUVEAU_BO_WR); @@ -202,7 +205,7 @@ nv04_surface_copy_m2mf(struct nv04_surface_2d *ctx, unsigned src_offset = src->offset + sy * src_pitch + sx * pf_get_blocksize(src->texture->format); - WAIT_RING (chan, 3 + ((h / 2047) + 1) * 9); + MARK_RING (chan, 3 + ((h / 2047) + 1) * 9, 2 + ((h / 2047) + 1) * 2); BEGIN_RING(chan, m2mf, NV04_MEMORY_TO_MEMORY_FORMAT_DMA_BUFFER_IN, 2); OUT_RELOCo(chan, src_bo, NOUVEAU_BO_GART | NOUVEAU_BO_VRAM | NOUVEAU_BO_RD); @@ -250,7 +253,7 @@ nv04_surface...

...ELOCo(chan, dst_bo, NOUVEAU_BO_GART | NOUVEAU_BO_VRAM | NOUVEAU_BO_WR); @@ -202,7 +205,7 @@ nv04_surface_copy_m2mf(struct nv04_surface_2d *ctx, unsigned src_offset = src->offset + sy * src_pitch + sx * pf_get_blocksize(src->texture->format); - WAIT_RING (chan, 3 + ((h / 2047) + 1) * 9); + MARK_RING (chan, 3 + ((h / 2047) + 1) * 9, 2 + ((h / 2047) + 1) * 2); BEGIN_RING(chan, m2mf, NV04_MEMORY_TO_MEMORY_FORMAT_DMA_BUFFER_IN, 2); OUT_RELOCo(chan, src_bo, NOUVEAU_BO_GART | NOUVEAU_BO_VRAM | NOUVEAU_BO_RD); @@ -250,7 +253,7 @@ nv04_surface...

...ELOCo(chan, dst_bo, NOUVEAU_BO_GART | NOUVEAU_BO_VRAM | NOUVEAU_BO_WR); @@ -202,7 +205,7 @@ nv04_surface_copy_m2mf(struct nv04_surface_2d *ctx, unsigned src_offset = src->offset + sy * src_pitch + sx * pf_get_blocksize(src->texture->format); - WAIT_RING (chan, 3 + ((h / 2047) + 1) * 9); + MARK_RING (chan, 3 + ((h / 2047) + 1) * 9, 2 + ((h / 2047) + 1) * 2); BEGIN_RING(chan, m2mf, NV04_MEMORY_TO_MEMORY_FORMAT_DMA_BUFFER_IN, 2); OUT_RELOCo(chan, src_bo, NOUVEAU_BO_GART | NOUVEAU_BO_VRAM | NOUVEAU_BO_RD); @@ -250,7 +253,7 @@ nv04_surface...

Signed-off-by: Maarten Maathuis <madman2003 at gmail.com> --- 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 +++

...include/drm/nouveau_pushbuf.h: In function ?AVAIL_RING?: /usr/include/drm/nouveau_pushbuf.h:93: error: ?struct nouveau_channel? has no member named ?end? /usr/include/drm/nouveau_pushbuf.h:93: error: ?struct nouveau_channel? has no member named ?cur? /usr/include/drm/nouveau_pushbuf.h: In function ?WAIT_RING?: /usr/include/drm/nouveau_pushbuf.h:100: error: ?struct nouveau_channel? has no member named ?cur? /usr/include/drm/nouveau_pushbuf.h:100: error: ?struct nouveau_channel? has no member named ?end? /usr/include/drm/nouveau_pushbuf.h: In function ?OUT_RELOC?: /usr/include/drm/nouveau_pushbuf.h:11...

...nvpb->pushbuf; req.dwords = (uint64_t)(unsigned long)nvpb->pushbuf; req.nr_buffers = nvpb->nr_buffers; req.buffers = (uint64_t)(unsigned long)nvpb->buffers; @@ -281,7 +277,7 @@ int nouveau_pushbuf_marker_emit(struct nouveau_channel *chan, unsigned wait_dwords, unsigned wait_relocs) { - struct nouveau_pushbuf_priv *nvpb = nouveau_pushbuf(chan->pushbuf); + struct nouveau_pushbuf_priv *nvpb = &nouveau_channel(chan)->pb; if (AVAIL_RING(chan) < wait_dwords) return nouveau_pushbuf_flush(chan, wait_dwords); @@ -289,7 +285,7 @@ nouveau_pushbuf_marker_emit(s...

...el planemask, Pixel fg) struct nouveau_grobj *rect = pNv->NvRectangle; struct nouveau_bo *bo = nouveau_pixmap_bo(pPixmap); unsigned delta = nouveau_pixmap_offset(pPixmap); - unsigned int fmt, pitch, color; + unsigned int fmt, pitch, fmt2 = NV04_GDI_RECTANGLE_TEXT_COLOR_FORMAT_A8R8G8B8; WAIT_RING(chan, 64); @@ -102,13 +102,12 @@ NV04EXAPrepareSolid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg) pitch = exaGetPixmapPitch(pPixmap); if (pPixmap->drawable.bitsPerPixel == 16) { - /* convert to 32bpp */ - uint32_t r = (fg&0x1F) * 255 / 31; - uint32_t g = ((f...

...ertion=0x7f26b358288a "ret == 0", file=<value optimized out>, line=289, function=0x7f26b3582910 "nouveau_pushbuf_flush") at assert.c:81 #3 0x00007f26b35810d1 in nouveau_pushbuf_flush (chan=0x902c50, min=951) at nouveau_pushbuf.c:289 #4 0x00007f26b37e8376 in WAIT_RING (size=<value optimized out>, chan=0x902c50) at /usr/include/nouveau/nouveau_pushbuf.h:79 #5 NV50EXAUploadSIFC (size=<value optimized out>, chan=0x902c50) at nv50_exa.c:399 #6 0x00007f26b37b9675 in nouveau_exa_upload_to_screen (pdpix=0x15edfd0, x=<value optimized out...

...50_context(pipe); struct nouveau_channel *chan = nv50->screen->base.channel; - struct nouveau_grobj *eng2d = nv50->screen->eng2d; - - /* We need this in the ddx for reliable composite, not sure what we're - * actually flushing. We generate all our own flushes with flags = 0. */ - WAIT_RING(chan, 2); - BEGIN_RING(chan, eng2d, 0x0110, 1); - OUT_RING (chan, 0); if (flags & PIPE_FLUSH_FRAME) FIRE_RING(chan); diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h index 4608854..be53990 100644 --- a/src/gallium/drivers/nv50/nv50_contex...

...urePtr pict_dst, + PixmapPtr src, + PixmapPtr mask, + PixmapPtr dst) { - ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; + ScrnInfoPtr pScrn = xf86Screens[dst->drawable.pScreen->myNum]; NVPtr pNv = NVPTR(pScrn); struct nouveau_channel *chan = pNv->chan; WAIT_RING(chan, 128); - state.is_a8_plus_a8 = FALSE; - state.have_mask=(pMaskPicture!=NULL); - pNv->alu = op; - pNv->pspict = pSrcPicture; - pNv->pmpict = pMaskPicture; - pNv->pdpict = pDstPicture; - pNv->pspix = pSrc; - pNv->pmpix = pMask; - pNv->pdpix = pDst; + pNv->pspict =...

...sformPtr t, int x, int y, float sx, float sy, float *x_ret, float *y_ret) { - PictVector v; - if (t) { + PictVector v; v.vector[0] = IntToxFixed(x); v.vector[1] = IntToxFixed(y); v.vector[2] = xFixed1; @@ -600,7 +541,9 @@ NV30EXAComposite(PixmapPtr pdPix, int srcX , int srcY, WAIT_RING(chan, 64); /* We're drawing a triangle, we need to scissor it to a quad. */ - /* The scissors are here for a good reason, we don't get the full image, but just a part. */ + /* The scissors are here for a good reason, we don't get the full + * image, but just a part. + */ /* H...