search for: pixmapptr

...+++++----------- 9 files changed, 38 insertions(+), 39 deletions(-) diff --git a/dix/pixmap.c b/dix/pixmap.c index b67a2e8a6..81ac5e2d8 100644 --- a/dix/pixmap.c +++ b/dix/pixmap.c @@ -181,12 +181,12 @@ PixmapDirtyDamageDestroy(DamagePtr damage, void *closure) } Bool -PixmapStartDirtyTracking(PixmapPtr src, +PixmapStartDirtyTracking(DrawablePtr src, PixmapPtr slave_dst, int x, int y, int dst_x, int dst_y, Rotation rotation) { - ScreenPtr screen = src->drawable.pScreen; + ScreenPtr screen = src->pScreen;...

...v50_xv.c | 2 +- src/nv_proto.h | 2 +- src/nv_type.h | 1 + 5 files 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);...

...veau_dri2.c b/src/nouveau_dri2.c index f22e319..4398559 100644 --- a/src/nouveau_dri2.c +++ b/src/nouveau_dri2.c @@ -142,6 +142,7 @@ nouveau_dri2_copy_region2(ScreenPtr pScreen, DrawablePtr pDraw, RegionPtr pRegio NVPtr pNv = NVPTR(xf86ScreenToScrn(pScreen)); RegionPtr pCopyClip; GCPtr pGC; + PixmapPtr pPix; DrawablePtr src_draw, dst_draw; Bool translate = FALSE; int off_x = 0, off_y = 0; @@ -170,9 +171,13 @@ nouveau_dri2_copy_region2(ScreenPtr pScreen, DrawablePtr pDraw, RegionPtr pRegio } if (translate && pDraw->type == DRAWABLE_WINDOW) { - PixmapPtr pPix = get_drawable_...

...Screen, int marker) { - NVSync(xf86Screens[pScreen->myNum]); + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + NVPtr pNv = NVPTR(pScrn); + + if (!pNv->exa_driver_pixmaps) + NVSync(xf86Screens[pScreen->myNum]); } static Bool @@ -351,17 +355,16 @@ nouveau_exa_modify_pixmap_header(PixmapPtr ppix, int width, int height, if (!nvpix->bo && nvpix->size) { uint32_t cpp = ppix->drawable.bitsPerPixel >> 3; - /* At some point we should just keep 1bpp pixmaps in sysram */ uint32_t flags = NOUVEAU_BO_VRAM; int ret; if (pNv->Architecture >= NV_ARCH...

...Jerez <currojerez at riseup.net> --- src/nv04_exa.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/nv04_exa.c b/src/nv04_exa.c index 132c9d5..7384cbc 100644 --- a/src/nv04_exa.c +++ b/src/nv04_exa.c @@ -197,16 +197,9 @@ NV04EXAPrepareCopy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int dx, int dy, return FALSE; planemask |= ~0 << pDstPixmap->drawable.bitsPerPixel; - if (planemask != ~0 || alu != GXcopy) { - if (pDstPixmap->drawable.bitsPerPixel == 32) - return FALSE; - BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_OPERATION, 1...

https://bugs.freedesktop.org/show_bug.cgi?id=48954 Bug #: 48954 Summary: nv25 PGRAPH error and X freeze Classification: Unclassified Product: xorg Version: git Platform: x86 (IA32) OS/Version: Linux (All) Status: NEW Severity: normal Priority: medium Component: Driver/nouveau

...-- src/drmmode_display.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/drmmode_display.c b/src/drmmode_display.c index b950f42..f326e46 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -680,10 +680,16 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix) PixmapPtr screenpix = screen->GetScreenPixmap(screen); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn); drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; + drmmode_ptr drmmode = drmmode_crtc->drmmode; int c, total_width = 0, max_height = 0, thi...

...reen, DrawablePtr pDraw, RegionPtr pRegio translate = TRUE; if (translate && pDraw->type == DRAWABLE_WINDOW) { - WindowPtr pWin = (WindowPtr)pDraw; - off_x = pWin->origin.x; - off_y = pWin->origin.y; + PixmapPtr pPix = get_drawable_pixmap(pDraw); + off_x = pDraw->x - pPix->screen_x; + off_y = pDraw->y - pPix->screen_y; } pGC = GetScratchGC(pDraw->depth, pScreen); Now I sort of assume that pDraw->x == pWin->origin.x. But... who knows. -i...

...NG(chan, rankine, NV34TCL_BLEND_FUNC_ENABLE, 3); OUT_RING (chan, 1); - OUT_RING (chan, (sblend << 16) | sblend); - OUT_RING (chan, (dblend << 16) | dblend); + OUT_RING (chan, sblend); + OUT_RING (chan, dblend); } } @@ -305,43 +255,47 @@ NV30EXATexture(ScrnInfoPtr pScrn, PixmapPtr pPix, PicturePtr pPict, int unit) struct nouveau_channel *chan = pNv->chan; struct nouveau_grobj *rankine = pNv->Nv3D; struct nouveau_bo *bo = nouveau_pixmap_bo(pPix); - nv_pict_texture_format_t *fmt; - uint32_t card_filter, card_repeat; uint32_t tex_reloc = NOUVEAU_BO_VRAM | NOUVEAU_...

...++++++++++++++++++++++++++---- src/nv_type.h | 10 ++++ 3 files changed, 188 insertions(+), 14 deletions(-) diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c index 3785956..2ad9932 100644 --- a/src/nouveau_dri2.c +++ b/src/nouveau_dri2.c @@ -267,7 +267,7 @@ can_exchange(DrawablePtr draw, PixmapPtr dst_pix, PixmapPtr src_pix) NVPtr pNv = NVPTR(scrn); int i; - if (!xf86_config->num_crtc) + if (xorgMir || !xf86_config->num_crtc) return FALSE; for (i = 0; i < xf86_config->num_crtc; i++) { @@ -290,7 +290,7 @@ can_sync_to_vblank(DrawablePtr draw) ScrnInfoPtr scrn = xf86S...

...mmode_display.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 2480122..f677e24 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -697,7 +697,13 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix) int c, total_width = 0, max_height = 0, this_x = 0; if (!ppix) { if (crtc->randr_crtc->scanout_pixmap) { - PixmapStopDirtyTracking(crtc->randr_crtc->scanout_pixmap, screenpix); + PixmapStopDirtyTracking( +#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC + &crtc->randr_cr...

...29 insertions(+), 4 deletions(-) diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c index ce0a573..8c29eca 100644 --- a/src/nouveau_dri2.c +++ b/src/nouveau_dri2.c @@ -248,9 +248,13 @@ static uint64_t dri2_sequence; static Bool update_front(DrawablePtr draw, DRI2BufferPtr front) { - int r; - PixmapPtr pixmap; + ScrnInfoPtr scrn = xf86ScreenToScrn(draw->pScreen); + NVPtr pNv = NVPTR(scrn); struct nouveau_dri2_buffer *nvbuf = nouveau_dri2_buffer(front); + struct nouveau_bo *pixmap_bo; + + PixmapPtr pixmap; + int r; if (draw->type == DRAWABLE_PIXMAP) pixmap = (PixmapPtr)draw; @@ -259...

...; --- src/nv04_exa.c | 19 +++++++++---------- src/nv_accel_common.c | 5 ++++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/nv04_exa.c b/src/nv04_exa.c index 132c9d5..1852f99 100644 --- a/src/nv04_exa.c +++ b/src/nv04_exa.c @@ -81,7 +81,7 @@ NV04EXAPrepareSolid(PixmapPtr pPixmap, int alu, Pixel 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...

...+ mask, dst); return FALSE; } } - NV10EXAFallbackInfo("Accelerating", op, pSrcPicture, pMaskPicture, pDstPicture); + print_fallback_info("Accelerating", op, src, mask, dst); return TRUE; } -static void NV10SetTexture(NVPtr pNv, int unit, PicturePtr Pict, PixmapPtr pixmap) +static void +setup_texture(NVPtr pNv, int unit, PicturePtr pict, PixmapPtr pixmap) { struct nouveau_channel *chan = pNv->chan; struct nouveau_grobj *celsius = pNv->Nv3D; struct nouveau_bo *bo = nouveau_pixmap_bo(pixmap); unsigned delta = nouveau_pixmap_offset(pixmap); - int...

...NOUVEAU_BO_APER | NOUVEAU_BO_RD }, 1); REGION_TRANSLATE(0, &reg, -draw->x, -draw->y); diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c index def66ac..3a93d02 100644 --- a/src/nouveau_exa.c +++ 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,...

Two "updated" patches, according to Michel Daenzers review. See separate e-mail for details. 01/10: Replaces original 01/09 -- Same code, updated commit message. 10/10: Just for demonstration, not for application to ddx.

A short series of compiler visibility warning fixes that I prepared whilst trialing improvements to xf86-video-nouveau's use of the core xorg-server utility macros. Rhys Kidd (4): wfb: Remove declaration for undefined function nouveau_wfb_init() dri2: Mark local create/destroy buffer and copy region functions as static xv: Mark local NVSetupTexturedVideo function as static

...0x0400 /* (src) a8 rt */ #define PFP_C_A8 0x0500 /* (src IN mask) a8 rt - same for CA and CA_SA */ #define PFP_NV12 0x0600 /* NV12 YUV->RGB */ diff --git a/src/nv50_exa.c b/src/nv50_exa.c index e86f903..8bacdf0 100644 --- a/src/nv50_exa.c +++ b/src/nv50_exa.c @@ -751,7 +751,7 @@ NV50EXABlend(PixmapPtr ppix, PicturePtr ppict, int op, int component_alpha) NV50EXA_LOCALS(ppix); struct nv50_blend_op *b = &NV50EXABlendOp[op]; unsigned sblend = b->src_blend; - unsigned dblend = b->dst_blend; + unsigned dblend = b->dst_blend, dblend_a = b->dst_blend; if (b->dst_alpha) {...

Hi, here a set of patches against the nouveau-ddx. This is an extended and revised set, based on Francisco Jerez feedback from autumn last year. [1/9] Makes pageflipping work again on X-Server 1.12rc. It apparently stopped working somewhere around Xorg 1.11+. [2/9] Implements handling of pageflip completion events from the kernel. Francisco Jerez argument against including it was that the

- map should handle this. --- src/nouveau_exa.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c index b656ca7..20ad380 100644 --- a/src/nouveau_exa.c +++ b/src/nouveau_exa.c @@ -259,7 +259,7 @@ nouveau_exa_mark_sync(ScreenPtr pScreen) static void nouveau_exa_wait_marker(ScreenPtr pScreen, int marker) { -