File 0004-add-EnableDisableFBAccess-to-compat-api.patch of Package xorg-x11-drv-omap

From 5daa7791874e4b531a3d8a9f349420f4891e6b3f Mon Sep 17 00:00:00 2001
From: Rob Clark <rob@ti.com>
Date: Thu, 30 Aug 2012 13:45:06 -0500
Subject: [PATCH 4/4] add EnableDisableFBAccess to compat-api

Fixes build break w/ latest xserver:

drmmode_display.c: In function 'drmmode_reallocate_scanout':
drmmode_display.c:1149:4: error: passing argument 1 of 'pScrn->EnableDisableFBAccess' makes pointer from integer without a cast [-Werror]
drmmode_display.c:1149:4: note: expected 'ScrnInfoPtr' but argument is of type 'int'
drmmode_display.c:1183:4: error: passing argument 1 of 'pScrn->EnableDisableFBAccess' makes pointer from integer without a cast [-Werror]
drmmode_display.c:1183:4: note: expected 'ScrnInfoPtr' but argument is of type 'int'
cc1: all warnings being treated as errors

Signed-off-by: Rob Clark <rob@ti.com>
---
 src/compat-api.h      |    4 ++++
 src/drmmode_display.c |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/compat-api.h b/src/compat-api.h
index b1591b1..4f7b9ea 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -64,6 +64,8 @@
 #define VT_FUNC_ARGS_DECL int arg, int flags
 #define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags)
 
+#define ENABLE_DISABLE_FB_ACCESS_ARGS(pScrn, b) pScrn->scrnIndex, b
+
 #define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex)
 #else
 #define SCRN_ARG_TYPE ScrnInfoPtr
@@ -89,6 +91,8 @@
 #define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
 #define VT_FUNC_ARGS(flags) pScrn
 
+#define ENABLE_DISABLE_FB_ACCESS_ARGS(pScrn, b) pScrn, b
+
 #define XF86_ENABLEDISABLEFB_ARG(x) (x)
 
 #endif
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 901782d..584fbb9 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1146,7 +1146,7 @@ drmmode_reallocate_scanout(ScrnInfoPtr pScrn, Bool redraw)
 
 	if (changed) {
 		if (pScreen && pScrn->EnableDisableFBAccess && redraw)
-			pScrn->EnableDisableFBAccess(pScrn->scrnIndex, FALSE);
+			pScrn->EnableDisableFBAccess(ENABLE_DISABLE_FB_ACCESS_ARGS(pScrn, FALSE));
 
 		/* delete old scanout buffer */
 		omap_bo_del(pOMAP->scanout);
@@ -1180,7 +1180,7 @@ drmmode_reallocate_scanout(ScrnInfoPtr pScrn, Bool redraw)
 		}
 
 		if (pScreen && pScrn->EnableDisableFBAccess && redraw)
-			pScrn->EnableDisableFBAccess(pScrn->scrnIndex, TRUE);
+			pScrn->EnableDisableFBAccess(ENABLE_DISABLE_FB_ACCESS_ARGS(pScrn, TRUE));
 	}
 
 	return TRUE;
-- 
1.7.10.3