xf86-video-amdgpu: Branch 'master' - 2 commits

[Michel Dänzer]

 src/amdgpu_kms.c      |    5 ++++-
 src/drmmode_display.c |    1 -
 src/drmmode_display.h |    3 ---
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit e900e48a11a93cde7d8d2d7bdb4a15ec705c56b1
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed May 10 18:37:56 2017 +0900

    Don't enable DRI3 without glamor
    
    Can't work currently. Fixes crash when trying to run a DRI3 client when
    glamor isn't enabled.
    
    Bugzilla: https://bugs.freedesktop.org/100968
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index 0182cbe..4df81f9 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -1741,7 +1741,10 @@ Bool AMDGPUScreenInit_KMS(SCREEN_INIT_ARGS_DECL)
 #endif
 
 	if (!amdgpu_is_gpu_screen(pScreen)) {
-		value = xorgGetVersion() >= XORG_VERSION_NUMERIC(1,18,3,0,0);
+		if (xorgGetVersion() >= XORG_VERSION_NUMERIC(1,18,3,0,0))
+			value = info->use_glamor;
+		else
+			value = FALSE;
 		from = X_DEFAULT;
 
 		if (info->use_glamor) {
commit 462ac3341e5bfbded9086d3d9043821d19352b3e
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue May 2 17:58:55 2017 +0900

    Remove unused struct members from drmmode_display.h
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 5b24314..9996d2f 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -2370,7 +2370,6 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
 	xf86CrtcConfigInit(pScrn, &drmmode_xf86crtc_config_funcs);
 
 	drmmode->scrn = pScrn;
-	drmmode->cpp = cpp;
 	mode_res = drmModeGetResources(pAMDGPUEnt->fd);
 	if (!mode_res)
 		return FALSE;
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index fa15a4f..2d5698f 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -38,8 +38,6 @@
 
 typedef struct {
 	unsigned fb_id;
-	drmModeFBPtr mode_fb;
-	int cpp;
 	ScrnInfoPtr scrn;
 #ifdef HAVE_LIBUDEV
 	struct udev_monitor *uevent_monitor;
@@ -55,7 +53,6 @@ typedef struct {
 } drmmode_rec, *drmmode_ptr;
 
 typedef struct {
-	int fd;
 	unsigned old_fb_id;
 	int flip_count;
 	void *event_data;