Attachment 101292 Details for Bug 80001 – Use the right DRI2ScreenPtr for calling reuse_notifier

[patch] Use the right DRI2ScreenPtr for calling reuse_notifier

0001-dri2-Use-the-PrimeScreen-when-creating-reusing-buffe.patch (text/plain), 2.48 KB, created by Chris Wilson on 2014-06-18 10:11:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2014-06-18 10:11:23 UTC

Size: 2.48 KB

patch

obsolete

>From 41e28770f2b7ae20511e88659e5465a043fe172c Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Wed, 18 Jun 2014 11:06:46 +0100
>Subject: [PATCH] dri2: Use the PrimeScreen when creating/reusing buffers
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This fixes a segfault when we attempt to call ds->reuse_notifier()
>passing a Prime DRI2BufferPtr to the master backend.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80001
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>Cc: Michel DÃ¤nzer <michel@daenzer.net>
>Cc: Dave Airlie <airlied@redhat.com>
>---
> hw/xfree86/dri2/dri2.c | 16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
>diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
>index 6dd7796..5705baa 100644
>--- a/hw/xfree86/dri2/dri2.c
>+++ b/hw/xfree86/dri2/dri2.c
>@@ -415,18 +415,14 @@ DRI2DrawableGone(void *p, XID id)
> }
> 
> static DRI2BufferPtr
>-create_buffer(DrawablePtr pDraw,
>+create_buffer(DRI2ScreenPtr ds, DrawablePtr pDraw,
>               unsigned int attachment, unsigned int format)
> {
>-    ScreenPtr primeScreen;
>-    DRI2DrawablePtr pPriv;
>-    DRI2ScreenPtr ds;
>     DRI2BufferPtr buffer;
>-    pPriv = DRI2GetDrawable(pDraw);
>-    primeScreen = GetScreenPrime(pDraw->pScreen, pPriv->prime_id);
>-    ds = DRI2GetScreenPrime(pDraw->pScreen, pPriv->prime_id);
>     if (ds->CreateBuffer2)
>-        buffer = (*ds->CreateBuffer2)(primeScreen, pDraw, attachment, format);
>+        buffer = (*ds->CreateBuffer2)(GetScreenPrime(pDraw->pScreen,
>+                                                     DRI2GetDrawable(pDraw)->prime_id),
>+                                      pDraw, attachment, format);
>     else
>         buffer = (*ds->CreateBuffer)(pDraw, attachment, format);
>     return buffer;
>@@ -475,7 +471,7 @@ allocate_or_reuse_buffer(DrawablePtr pDraw, DRI2ScreenPtr ds,
>     if ((old_buf < 0)
>         || attachment == DRI2BufferFrontLeft
>         || !dimensions_match || (pPriv->buffers[old_buf]->format != format)) {
>-        *buffer = create_buffer (pDraw, attachment, format);
>+        *buffer = create_buffer(ds, pDraw, attachment, format);
>         return TRUE;
> 
>     }
>@@ -538,7 +534,7 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height,
>         return NULL;
>     }
> 
>-    ds = DRI2GetScreen(pDraw->pScreen);
>+    ds = DRI2GetScreenPrime(pDraw->pScreen, pPriv->prime_id);
> 
>     dimensions_match = (pDraw->width == pPriv->width)
>         && (pDraw->height == pPriv->height);
>-- 
>2.0.0
>

Actions: View | Splinter Review

Attachments on bug 80001: 101006 | 101010 | 101014 | 101051 | 101273 | 101292 | 101332

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.