xf86-video-amdgpu: Branch 'master'

[GitLab Mirror]

 src/drmmode_display.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit aa572683d86174be2bfc09d4e173ae2a9907d40e
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Oct 10 17:28:35 2018 +0200

    Fix condition for calling set_pixmap_bo in drmmode_xf86crtc_resize
    
    This matches CreateScreenResources_KMS.
    
    Fixes crash when resizing the screen (e.g. using xrandr) with depth <
    24.
    
    Bugzilla: https://bugs.freedesktop.org/104914
    Acked-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 5315747..9065e0f 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -2881,8 +2881,7 @@ static Bool drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
 	if (!amdgpu_glamor_create_screen_resources(scrn->pScreen))
 		goto fail;
 
-	if (info->use_glamor ||
-	    (info->front_buffer->flags & AMDGPU_BO_FLAGS_GBM)) {
+	if (info->use_glamor || info->dri2.enabled) {
 		if (!amdgpu_set_pixmap_bo(ppix, info->front_buffer))
 			goto fail;
 	}