summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2016-05-06 10:46:14 +1000
committerAdam Jackson <ajax@redhat.com>2016-06-08 12:51:51 -0400
commita6b6e8ba026acedef6336b17adf06aebddd5f22f (patch)
tree17087dc2c6efbc2551382ff27761524bb800a541 /dix
parentaa5390aa83be55f887e3b4f78681b4f3d3386eb5 (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 'dix')
-rw-r--r--dix/pixmap.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/dix/pixmap.c b/dix/pixmap.c
index 11d83fe00..49267a19b 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -132,6 +132,13 @@ FreePixmap(PixmapPtr pPixmap)
free(pPixmap);
}
+void PixmapUnshareSlavePixmap(PixmapPtr slave_pixmap)
+{
+ int ihandle = -1;
+ ScreenPtr pScreen = slave_pixmap->drawable.pScreen;
+ pScreen->SetSharedPixmapBacking(slave_pixmap, ((void *)(long)ihandle));
+}
+
PixmapPtr PixmapShareToSlave(PixmapPtr pixmap, ScreenPtr slave)
{
PixmapPtr spix;