Attachment 139609 Details for Bug 106293 – Bail from dri2_create_buffer2 if we can't get a pixmap

[patch] Bail from dri2_create_buffer2 if we can't get a pixmap

0001-Bail-from-dri2_create_buffer2-if-we-can-t-get-a-pixm.patch (text/plain), 2.37 KB, created by Michel Dänzer on 2018-05-17 07:52:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2018-05-17 07:52:29 UTC

Size: 2.37 KB

patch

obsolete

>From d1d1224abe35c90d32327701ba600106289aaea5 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
>Date: Thu, 17 May 2018 09:50:50 +0200
>Subject: [PATCH xf86-video-ati] Bail from dri2_create_buffer2 if we can't get
> a pixmap
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>---
> src/radeon_dri2.c | 40 +++++++++++++++++++---------------------
> 1 file changed, 19 insertions(+), 21 deletions(-)
>
>diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
>index 9f373589d..3b75f66f3 100644
>--- a/src/radeon_dri2.c
>+++ b/src/radeon_dri2.c
>@@ -233,37 +233,36 @@ radeon_dri2_create_buffer2(ScreenPtr pScreen,
> 					  flags | RADEON_CREATE_PIXMAP_DRI2);
>     }
> 
>+    if (!pixmap)
>+	return NULL;
>+
>     buffers = calloc(1, sizeof *buffers);
>     if (buffers == NULL)
>         goto error;
> 
>-    if (pixmap) {
>-	if (!info->use_glamor) {
>-	    info->exa_force_create = TRUE;
>-	    exaMoveInPixmap(pixmap);
>-	    info->exa_force_create = FALSE;
>-	    if (exaGetPixmapDriverPrivate(pixmap) == NULL) {
>-		/* this happen if pixmap is non accelerable */
>-		goto error;
>-	    }
>-	} else if (is_glamor_pixmap) {
>-	    pixmap = radeon_glamor_set_pixmap_bo(drawable, pixmap);
>-	    pixmap->refcnt++;
>-	}
>-
>-	if (!radeon_get_flink_name(pRADEONEnt, pixmap, &buffers->name))
>+    if (!info->use_glamor) {
>+	info->exa_force_create = TRUE;
>+	exaMoveInPixmap(pixmap);
>+	info->exa_force_create = FALSE;
>+	if (exaGetPixmapDriverPrivate(pixmap) == NULL) {
>+	    /* this happen if pixmap is non accelerable */
> 	    goto error;
>+	}
>+    } else if (is_glamor_pixmap) {
>+	pixmap = radeon_glamor_set_pixmap_bo(drawable, pixmap);
>+	pixmap->refcnt++;
>     }
> 
>+    if (!radeon_get_flink_name(pRADEONEnt, pixmap, &buffers->name))
>+	goto error;
>+
>     privates = calloc(1, sizeof(struct dri2_buffer_priv));
>     if (privates == NULL)
>         goto error;
> 
>     buffers->attachment = attachment;
>-    if (pixmap) {
>-	buffers->pitch = pixmap->devKind;
>-	buffers->cpp = cpp;
>-    }
>+    buffers->pitch = pixmap->devKind;
>+    buffers->cpp = cpp;
>     buffers->driverPrivate = privates;
>     buffers->format = format;
>     buffers->flags = 0; /* not tiled */
>@@ -275,8 +274,7 @@ radeon_dri2_create_buffer2(ScreenPtr pScreen,
> 
> error:
>     free(buffers);
>-    if (pixmap)
>-        (*pScreen->DestroyPixmap)(pixmap);
>+    (*pScreen->DestroyPixmap)(pixmap);
>     return NULL;
> }
> 
>-- 
>2.17.0
>

Actions: View | Splinter Review

Attachments on bug 106293: 139349 | 139545 | 139546 | 139578 | 139599 | 139609

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.