diff options
| author | Dave Airlie <airlied@gmail.com> | 2016-05-06 10:46:14 +1000 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-06-08 12:51:51 -0400 |
| commit | a6b6e8ba026acedef6336b17adf06aebddd5f22f (patch) | |
| tree | 17087dc2c6efbc2551382ff27761524bb800a541 /hw/xfree86/dri2/dri2.c | |
| parent | aa5390aa83be55f887e3b4f78681b4f3d3386eb5 (diff) | |
prime: clean up slave bo properly. (v3)
This is an ABI break, in that we now pass NULL to a function that hasn't
accepted it before.
Alex Goins had a different patch for this but it wasn't symmetrical, it
freed something in a very different place than it allocated it, this
attempts to retain symmetry in the releasing of the backing bo.
v2: use a new toplevel API, though it still passes NULL to something
that wasn't expecting it.
v3: pass -1 instead of 0.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Alex Goins <agoins at nvidia.com>
Diffstat (limited to 'hw/xfree86/dri2/dri2.c')
| -rw-r--r-- | hw/xfree86/dri2/dri2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c index d55be1913..f80599fb7 100644 --- a/hw/xfree86/dri2/dri2.c +++ b/hw/xfree86/dri2/dri2.c @@ -859,6 +859,7 @@ DrawablePtr DRI2UpdatePrime(DrawablePtr pDraw, DRI2BufferPtr pDest) if (pPriv->prime_slave_pixmap->master_pixmap == mpix) return &pPriv->prime_slave_pixmap->drawable; else { + PixmapUnshareSlavePixmap(pPriv->prime_slave_pixmap); (*pPriv->prime_slave_pixmap->master_pixmap->drawable.pScreen->DestroyPixmap)(pPriv->prime_slave_pixmap->master_pixmap); (*slave->DestroyPixmap)(pPriv->prime_slave_pixmap); pPriv->prime_slave_pixmap = NULL; |