xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/drmmode_display.c |    1 -
 src/drmmode_display.h |    2 --
 2 files changed, 3 deletions(-)

New commits:
commit 3a9f7e87c30b9f6334d38dfdd1cb15b28fe37fcb
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu May 11 18:57:25 2017 +0900

    Remove unused struct members from drmmode_display.h
    
    (Ported from amdgpu commit 462ac3341e5bfbded9086d3d9043821d19352b3e)
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index e2899cf5..d0ecfa85 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -2540,7 +2540,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(drmmode->fd);
 	if (!mode_res)
 		return FALSE;
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index df2c4b7b..db68054a 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -41,8 +41,6 @@
 
 typedef struct {
   int fd;
-  drmModeFBPtr mode_fb;
-  int cpp;
   struct radeon_bo_manager *bufmgr;
   ScrnInfoPtr scrn;
 #ifdef HAVE_LIBUDEV