xf86-video-amdgpu: Branch 'master'

[GitLab Mirror]

 src/amdgpu_glamor.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6bd3dc6bd8af238868154f24a37ff13cc9aa2705
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Fri Aug 28 10:50:50 2020 +0200

    Check for AMDGPU_CREATE_PIXMAP_SCANOUT in amdgpu_glamor_create_pixmap
    
    We must not call glamor_create_pixmap or fbCreatePixmap when it's set.
    
    Closes: https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/issues/21

diff --git a/src/amdgpu_glamor.c b/src/amdgpu_glamor.c
index 409cb76..fb7a46b 100644
--- a/src/amdgpu_glamor.c
+++ b/src/amdgpu_glamor.c
@@ -209,7 +209,8 @@ amdgpu_glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
 	if (!format)
 		return NULL;
 
-	if (!AMDGPU_CREATE_PIXMAP_SHARED(usage)) {
+	if (!(usage & AMDGPU_CREATE_PIXMAP_SCANOUT) &&
+	    !AMDGPU_CREATE_PIXMAP_SHARED(usage)) {
 		if (info->shadow_primary) {
 			if (usage != CREATE_PIXMAP_USAGE_BACKING_PIXMAP)
 				return fbCreatePixmap(screen, w, h, depth, usage);