search for: drawableptr

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

--- src/nouveau_dri2.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/nouveau_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,...

...ertions(+), 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; PixmapDirtyUpdatePtr dirty_update; R...

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

...and not break it under the others. Signed-off-by: Dave Airlie <airlied at redhat.com> diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c index 71cff26..7bd0b3a 100644 --- a/src/nouveau_dri2.c +++ b/src/nouveau_dri2.c @@ -165,9 +165,9 @@ nouveau_dri2_copy_region2(ScreenPtr pScreen, 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 =...

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.

On 18/04/17 07:07 PM, Michel Dänzer wrote: > From: Michel Dänzer <michel.daenzer at amd.com> > > Signed-off-by: Michel Dänzer <michel.daenzer at amd.com> > --- > > Chris / Ilia / Ben, this should be manageable for the intel/nouveau > drivers, right? Any feedback, guys? I want to push the xserver change soon-ish. I could probably come up with a corresponding

On Thu, Jul 13, 2017 at 4:27 AM, Michel Dänzer <michel at daenzer.net> wrote: > On 18/04/17 07:07 PM, Michel Dänzer wrote: >> From: Michel Dänzer <michel.daenzer at amd.com> >> >> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com> >> --- >> >> Chris / Ilia / Ben, this should be manageable for the intel/nouveau >> drivers, right?

On Thu, Jul 13, 2017 at 10:14 PM, Michel Dänzer <michel at daenzer.net> wrote: > On 13/07/17 09:31 PM, Ilia Mirkin wrote: >> On Thu, Jul 13, 2017 at 4:27 AM, Michel Dänzer <michel at daenzer.net> wrote: >>> On 18/04/17 07:07 PM, Michel Dänzer wrote: >>>> From: Michel Dänzer <michel.daenzer at amd.com> >>>> >>>> Signed-off-by:

From: Michel Dänzer <michel.daenzer at amd.com> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com> --- Chris / Ilia / Ben, this should be manageable for the intel/nouveau drivers, right? src/amdgpu_drv.h | 26 ++++++++++++++++++++++++++ src/amdgpu_kms.c | 18 +++++++++--------- src/drmmode_display.c | 8 ++++++-- 3 files changed, 41 insertions(+), 11 deletions(-)

On 13/07/17 09:31 PM, Ilia Mirkin wrote: > On Thu, Jul 13, 2017 at 4:27 AM, Michel Dänzer <michel at daenzer.net> wrote: >> On 18/04/17 07:07 PM, Michel Dänzer wrote: >>> From: Michel Dänzer <michel.daenzer at amd.com> >>> >>> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com> >>> --- >>> >>> Chris / Ilia / Ben,

...- tile_y * TILE_HEIGHT - subtile_y * SUBTILE_HEIGHT) * SUBTILE_PITCH) + + (line_x - tile_x * TILE_PITCH - subtile_x * SUBTILE_PITCH) + + subpixel_offset; + + memcpy(new_dst, &value, size); +} + +void +nouveau_exa_wfb_setup_wrap(ReadMemoryProcPtr *pRead, + WriteMemoryProcPtr *pWrite, + DrawablePtr pDraw) +{ + ScrnInfoPtr pScrn = xf86Screens[pDraw->pScreen->myNum]; + NVPtr pNv = NVPTR(pScrn); + PixmapPtr pPixmap; + + if (!pRead || !pWrite) + return; + + pPixmap = NVGetDrawablePixmap(pDraw); + if (!pPixmap) + return; + + int i; + for (i = 0; i < 6; i++) + if (!pNv->wfb_pixmaps[i...

Hi all, the following patch fixes a race-condition in the nouveau ddx which caused frequent x-server crashes for at least 1 user under some loads when OpenGL triple-buffering is enabled, which it is by default on XOrg 1.12 and later. As a side effect, it provides a small optimization for the common case of bufferswap at next vblank. The other way to avoid the race + possible crash is to set

...veau_present.c | 15 ++++++++++++++- 2 files changed, 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 == DR...

...src/nouveau_dri2.c | 4 +++- src/nv_accel_common.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c index d14443f..b99893f 100644 --- a/src/nouveau_dri2.c +++ b/src/nouveau_dri2.c @@ -46,6 +46,8 @@ nouveau_dri2_create_buffer(DrawablePtr pDraw, unsigned int attachment, ppix->refcnt++; } else { + /* 'format' is just depth */ + unsigned int depth = NOUVEAU_ALIGN(format, 2); unsigned int usage_hint = NOUVEAU_CREATE_PIXMAP_TILED; if (attachment == DRI2BufferDepth || @@ -55,7 +57,7 @@ nouveau_dri2_create_buff...

...e behavior - is due to be reverted) --- src/nouveau_dri2.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c index 588735f..3d8d22f 100644 --- a/src/nouveau_dri2.c +++ b/src/nouveau_dri2.c @@ -328,7 +328,8 @@ nouveau_dri2_finish_swap(DrawablePtr draw, unsigned int frame, type = DRI2_EXCHANGE_COMPLETE; DamageRegionAppend(draw, &reg); - if (DRI2CanFlip(draw)) { + if (DRI2CanFlip(draw) && pNv->has_pageflip && + draw->type == DRAWABLE_WINDOW) { type = DRI2_FLIP_COMPLETE; ret = drmmode_page_flip(dr...

...xwayland: Refactor xwl_present_for_each_frame_callback helper xwayland: Prevent nested xwl_present_for_each_frame_callback calls xwayland/glamor/gbm: Use EGL_NO_CONTEXT with EGL_NATIVE_PIXMAP_KHR glamor: Remove unused transfer functions glamor: Make program APIs take DrawablePtrs instead of PixmapPtrs glamor: Take DrawablePtr instead of PixmapPtr in up/download_boxes glamor: Eliminate glamor_fini_pixmap glamor: glamor_prep_pixmap_box ? glamor_prep_drawable_box glamor: Fix up alpha channel if needed in glamor_upload_boxes glamor: Use Drawa...

...After that xorg stays up long enough to crash in nouveau_exa_share_pixmap_backing, I'm still investigating that. :-) diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c index e3445b2..69fcd8c 100644 --- a/src/nouveau_dri2.c +++ b/src/nouveau_dri2.c @@ -684,7 +684,7 @@ nouveau_dri2_finish_swap(DrawablePtr draw, unsigned int frame, /* Reference the back buffer to sync it to vblank */ nouveau_pushbuf_refn(push, &(struct nouveau_pushbuf_refn) { src_bo, - NOUVEAU_BO_VRAM | NOUVEAU_BO_RD + NOUVEAU_BO_APER | NOUVEAU_BO_RD }, 1); if (pNv->Architecture >...

...Only handle reflection in the driver with Xorg < 1.16 Use root window (pixmap) instead of screen pixmap for scanout updates Add drmmode_crtc_can_flip helper Allow DRI page flipping when some CRTCs use separate scanout buffers Adapt to PixmapDirtyUpdateRec::src being a DrawablePtr Remove drmmode_crtc->scanout_destroy[] array Pass reference CRTC to amdgpu_do_pageflip directly Create drmmode_wait_vblank helper Create drmmode_crtc_wait_pending_event helper macro Wait for pending flips synchronously before turning off a CRTC Handle multiple...

...OCAL_AMFLAGS = -I m4 autogen.sh: Pass -f to autoreconf Use root window (pixmap) instead of screen pixmap for scanout updates Add drmmode_crtc_can_flip helper Allow DRI page flipping when some CRTCs use separate scanout buffers Adapt to PixmapDirtyUpdateRec::src being a DrawablePtr Remove drmmode_crtc->scanout_destroy[] array Pass reference CRTC to radeon_do_pageflip directly Create drmmode_wait_vblank helper Create drmmode_crtc_wait_pending_event helper macro Wait for pending flips synchronously before turning off a CRTC Handle multiple...