Attachment 107930 Details for Bug 85058 – Detach SHM segment after Pixmap release

[patch] Detach SHM segment after Pixmap release

0001-Xext-shm-Detach-SHM-segment-after-Pixmap-is-released.patch (text/plain), 1.72 KB, created by Chris Wilson on 2014-10-16 13:06:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2014-10-16 13:06:51 UTC

Size: 1.72 KB

patch

obsolete

>From 68a0090f44badcb6bfd74101d0e2116ced1f1eb4 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Thu, 16 Oct 2014 10:25:50 +0100
>Subject: [PATCH] Xext/shm: Detach SHM segment after Pixmap is released
>
>The GPU may still have a reference to the SHM segment which would only
>be finally released when the Pixmap is destroy. So we can only detach
>the SHM segment (and thereby making the memory unaccessible) after the
>backend has had a chance to flush any remaining references.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85058
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> Xext/shm.c | 15 +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
>
>diff --git a/Xext/shm.c b/Xext/shm.c
>index 4dad8b6..b787918 100644
>--- a/Xext/shm.c
>+++ b/Xext/shm.c
>@@ -248,21 +248,20 @@ ShmDestroyPixmap(PixmapPtr pPixmap)
> {
>     ScreenPtr pScreen = pPixmap->drawable.pScreen;
>     ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(pScreen);
>+    void *shmdesc = NULL;
>     Bool ret;
> 
>-    if (pPixmap->refcnt == 1) {
>-        ShmDescPtr shmdesc;
>-
>-        shmdesc = (ShmDescPtr) dixLookupPrivate(&pPixmap->devPrivates,
>-                                                shmPixmapPrivateKey);
>-        if (shmdesc)
>-            ShmDetachSegment((void *) shmdesc, pPixmap->drawable.id);
>-    }
>+    if (pPixmap->refcnt == 1)
>+        shmdesc = dixLookupPrivate(&pPixmap->devPrivates, shmPixmapPrivateKey);
> 
>     pScreen->DestroyPixmap = screen_priv->destroyPixmap;
>     ret = (*pScreen->DestroyPixmap) (pPixmap);
>     screen_priv->destroyPixmap = pScreen->DestroyPixmap;
>     pScreen->DestroyPixmap = ShmDestroyPixmap;
>+
>+    if (shmdesc)
>+	ShmDetachSegment(shmdesc, pPixmap->drawable.id);
>+
>     return ret;
> }
> 
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 85058: 107870 | 107872 | 107879 | 107880 | 107886 | 107893 | 107894 | 107895 | 107930

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.