search for: src_pitch

...s changed, 26 insertions(+), 16 deletions(-) diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c index 4769fd9..b5eb421 100644 --- a/src/nouveau_exa.c +++ b/src/nouveau_exa.c @@ -57,7 +57,7 @@ NVAccelDownloadM2MF(PixmapPtr pspix, int x, int y, int w, int h, unsigned line_len = w * cpp; unsigned src_pitch = 0, linear = 0; - if (!nouveau_exa_pixmap_is_tiled(pspix)) { + if (!nv50_style_tiled_pixmap(pspix)) { linear = 1; src_pitch = exaGetPixmapPitch(pspix); src_offset += (y * src_pitch) + (x * cpp); @@ -175,7 +175,7 @@ NVAccelUploadM2MF(PixmapPtr pdpix, int x, int y, int w, int h, un...

...th xorg-server 1.3 (also 1.2) and Nouveau DRM and DDX from git May 12th 2007, starting sylpheed-claws leads to a deterministic segfault with the following backtrace: #0 0x00002b7f8689c237 in NVUploadToScreen (pDst=0xb782b0, x=0, y=0, w=16, h=5, src=0x2b7f8e293440 "????????????\005", src_pitch=6144) at nv_exa.c:351 #1 0x00002b7f883b94b1 in exaPutImage (pDrawable=0xb782b0, pGC=0x7c8300, depth=<value optimized out>, x=-784, y=-48, w=<value optimized out>, h=64, leftPad=0, format=2, bits=0x2b7f8e23a000 "") at exa_accel.c:206 #2 0x0000000000522fdb in damagePut...

...helper.h> #include <drm/drm_framebuffer.h> #include <drm/drm_fourcc.h> @@ -125,6 +127,30 @@ static void convert_lines(void *dst, unsigned int dst_pitch, kfree(sbuf); } +static void convert_lines_toio(void __iomem *dst, unsigned int dst_pitch, + void *src, unsigned int src_pitch, + unsigned int pixels, + unsigned int lines, + struct drm_format_convert *conv) +{ + u32 dst_linelength = pixels * conv->dst_cpp; + u32 y; + void *dbuf; + + dbuf = kmalloc(dst_linelength, GFP_KERNEL); + if (!dbuf) + return; + + for (y = 0; y < lines; y++) { + con...

...format_helper.c +++ b/drivers/gpu/drm/drm_format_helper.c @@ -113,42 +113,22 @@ void drm_fb_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb, } EXPORT_SYMBOL(drm_fb_swab16); -static void drm_fb_xrgb8888_to_rgb565_lines(void *dst, unsigned int dst_pitch, - void *src, unsigned int src_pitch, - unsigned int src_linelength, - unsigned int lines, - bool swap) +static void drm_fb_xrgb8888_to_rgb565_line(u16 *dbuf, u32 *sbuf, + unsigned int pixels, + bool swab) { - unsigned int linepixels = src_linelength / sizeof(u32); - unsigned int x, y; - u32 *sbu...

...pu/drm/drm_format_helper.c @@ -216,33 +216,16 @@ void drm_fb_xrgb8888_to_rgb565_dstclip(void __iomem *dst, unsigned int dst_pitch } EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565_dstclip); -static void drm_fb_xrgb8888_to_rgb888_lines(void *dst, unsigned int dst_pitch, - void *src, unsigned int src_pitch, - unsigned int src_linelength, - unsigned int lines) +static void drm_fb_xrgb8888_to_rgb888_line(u8 *dbuf, u32 *sbuf, + unsigned int pixels) { - unsigned int linepixels = src_linelength / 3; - unsigned int x, y; - u32 *sbuf; - u8 *dbuf; + unsigned int x; - sbuf = kmalloc(...

...lt;linux/slab.h> +#include <linux/io.h> #include <drm/drm_format_helper.h> #include <drm/drm_framebuffer.h> #include <drm/drm_fourcc.h> #include <drm/drm_rect.h> -static void drm_fb_memcpy_lines(void *dst, unsigned int dst_pitch, - void *src, unsigned int src_pitch, - unsigned int linelength, unsigned int lines) +static unsigned int clip_offset(struct drm_rect *clip, + unsigned int pitch, unsigned int cpp) { - int line; - - for (line = 0; line < lines; line++) { - memcpy(dst, src, linelength); - src += src_pitch; - dst += dst_pitch; - } + return...

.../nv50_transfer.c @@ -47,7 +47,7 @@ nv50_transfer_rect_m2mf(struct pipe_screen *pscreen, NV50_MEMORY_TO_MEMORY_FORMAT_LINEAR_IN, 1); OUT_RING (chan, 1); BEGIN_RING(chan, m2mf, - NV50_MEMORY_TO_MEMORY_FORMAT_PITCH_IN, 1); + NV04_MEMORY_TO_MEMORY_FORMAT_PITCH_IN, 1); OUT_RING (chan, src_pitch); src_offset += (sy * src_pitch) + (sx * cpp); } else { @@ -66,7 +66,7 @@ nv50_transfer_rect_m2mf(struct pipe_screen *pscreen, NV50_MEMORY_TO_MEMORY_FORMAT_LINEAR_OUT, 1); OUT_RING (chan, 1); BEGIN_RING(chan, m2mf, - NV50_MEMORY_TO_MEMORY_FORMAT_PITCH_OUT, 1); + NV04_MEMORY_TO_M...

...n2003 at gmail.com> --- src/nv50_exa.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/src/nv50_exa.c b/src/nv50_exa.c index 10a3a64..59c198f 100644 --- a/src/nv50_exa.c +++ b/src/nv50_exa.c @@ -431,6 +431,26 @@ NV50EXAUploadSIFC(const char *src, int src_pitch, return TRUE; } +/* Compat defines for pre 1.7 xservers. */ +#ifndef PICT_a2b10g10r10 +#define PICT_a2b10g10r10 PICT_FORMAT(32, PICT_TYPE_ABGR, 2, 10, 10, 10) +#endif +#ifndef PICT_x2b10g10r10 +#define PICT_x2b10g10r10 PICT_FORMAT(32, PICT_TYPE_ABGR, 0, 10, 10, 10) +#endif +#ifndef PICT_a2r10...

...InfoPtr pScrnInfo, Time currentTime) pNv->VideoTimerCallback = needCallback ? NVVideoTimerCallback : NULL; } +/** + * NVPutOverlayImage + * program hardware to overlay image into front buffer + * + * @param pScrnInfo screen + * @param src_offset + * @param id colorspace of image + * @param src_pitch + * @param dstBox + * @param x1 + * @param y1 + * @param x2 + * @param y2 + * @param width + * @param height + * @param src_w + * @param src_h + * @param drw_w + * @param drw_h + * @param clipBoxes + */ static void NVPutOverlayImage(ScrnInfoPtr pScrnInfo, int offset, int id, int dstPitch, Bo...

...pipe_screen *pscreen, struct pipe_buffer *src, OUT_RELOCl(chan, dst_bo, dst_offset, dst_reloc); if (src_bo->tiled) { BEGIN_RING(chan, m2mf, 0x0218, 1); - OUT_RING (chan, (dy << 16) | sx); + OUT_RING (chan, (sy << 16) | sx); } else { src_offset += (line_count * src_pitch); } if (dst_bo->tiled) { BEGIN_RING(chan, m2mf, 0x0234, 1); - OUT_RING (chan, (sy << 16) | dx); + OUT_RING (chan, (dy << 16) | dx); } else { dst_offset += (line_count * dst_pitch); } ---------------------------

...+++ b/src/nouveau_exa.c @@ -263,7 +263,7 @@ nouveau_exa_download_from_screen(PixmapPtr pspix, int x, int y, int w, int h, goto memcpy; if (!NVAccelM2MF(pNv, w, lines, cpp, 0, tmp_offset, - nouveau_pixmap_bo(pspix), NOUVEAU_BO_VRAM, + nouveau_pixmap_bo(pspix), NOUVEAU_BO_APER, src_pitch, pspix->drawable.height, x, y, tmp, NOUVEAU_BO_GART, tmp_pitch, lines, 0, 0)) @@ -361,7 +361,7 @@ nouveau_exa_upload_to_screen(PixmapPtr pdpix, int x, int y, int w, int h, if (!NVAccelM2MF(pNv, w, lines, cpp, tmp_offset, 0, tmp, NOUVEAU_BO_GART, tmp_pitch, lines, 0, 0, -...

...uis <madman2003 at gmail.com> --- src/nv50_exa.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/nv50_exa.c b/src/nv50_exa.c index 10a3a64..c558896 100644 --- a/src/nv50_exa.c +++ b/src/nv50_exa.c @@ -431,6 +431,14 @@ NV50EXAUploadSIFC(const char *src, int src_pitch, return TRUE; } +/* Compat defines for pre 1.7 xservers. */ +#ifndef PICT_a2b10g10r10 +#define PICT_a2b10g10r10 PICT_FORMAT(32, PICT_TYPE_ABGR, 2, 10, 10, 10) +#define PICT_x2b10g10r10 PICT_FORMAT(32, PICT_TYPE_ABGR, 0, 10, 10, 10) +#define PICT_a2r10g10b10 PICT_FORMAT(32, PICT_TYPE_ARGB, 2, 1...

...userchan=<value optimized out>) at nouveau_bo.c:169 #4 0x00002b79db1806d9 in nouveau_dma_kickoff (userchan=0x3d8f) at nouveau_dma.c:157 #5 0x00002b79db1b60e0 in NV40PutTextureImage (pScrn=0x0, src=0x17cc700, src_offset=0, src_offset2=691200, id=<value optimized out>, src_pitch=<value optimized out>, dstBox=0x7fffd2c324c0, x1=0, y1=0, x2=62914560, y2=47185920, width=960, height=720, src_w=480, src_h=360, drw_w=960, drw_h=720, clipBoxes=0x7fffd2c325c0, ppix=0x1c412f0, pPriv=0x8213b8) at nv40_xv_tex.c:356 #6 0x00002b79db187d64 in NVPutImage (pScrn=0x7f...

...7R\202\224\377T\204\226\377S\203\225\377S\201\223\377Q\177\220\377R~\217\377O{\214\377Kw\210\377Fr\203\377 at l}\377=hy\377:ev\377:ev\377\065`q\377\064\\n\377\066^p\377\070`r\377\071as\377;cu\377=ew\377<bt\377<bt\377:`r\377\071_q\377:`r\377?ew\377Bhz\377Ci{\377 at ey\377=bv\377"..., src_pitch=<value optimized out>) at nouveau_exa.c:516 #7 0x00007f26b197a50f in exaCopyDirty (migrate=<value optimized out>, ---Type <return> to continue, or q <return> to quit--- pValidDst=<value optimized out>, pValidSrc=<value optimized out>, transfer=0x7f26b3...

Hi, latest 2D driver does not compile. libdrm and Mesa are latest git... Johannes CC nv50_exa.lo nv50_exa.c: In function 'NV50EXACheckRenderTarget': nv50_exa.c:451: error: 'PICT_a2b10g10r10' undeclared (first use in this function) nv50_exa.c:451: error: (Each undeclared identifier is reported only once nv50_exa.c:451: error: for each function it appears in.) nv50_exa.c:452:

...ub_h)/sub_h)*2); + BEGIN_RING(chan, swzsurf, NV04_SWIZZLED_SURFACE_DMA_IMAGE, 1); OUT_RELOCo(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,...

...ub_h)/sub_h)*2); + BEGIN_RING(chan, swzsurf, NV04_SWIZZLED_SURFACE_DMA_IMAGE, 1); OUT_RELOCo(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,...

https://bugs.freedesktop.org/show_bug.cgi?id=55980 Priority: medium Bug ID: 55980 Assignee: nouveau at lists.freedesktop.org Summary: X Segfault on second screen resize QA Contact: xorg-team at lists.x.org Severity: critical Classification: Unclassified OS: Linux (All) Reporter: geaaru at gmail.com

...ub_h)/sub_h)*2); + BEGIN_RING(chan, swzsurf, NV04_SWIZZLED_SURFACE_DMA_IMAGE, 1); OUT_RELOCo(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,...

https://bugs.freedesktop.org/show_bug.cgi?id=70510 Priority: medium Bug ID: 70510 Assignee: nouveau at lists.freedesktop.org Summary: Xorg crash on KDE init QA Contact: xorg-team at lists.x.org Severity: normal Classification: Unclassified OS: All Reporter: estellnb at elstel.org Hardware: Other