[gentoo-commits] dev/maekke:master commit in: x11-drivers/xf86-video-armsoc/files/, x11-drivers/xf86-video-armsoc/

["Markus Meier" <maekke@gentoo.org>]

commit:     e431bc97af079c0570725a43c451f3cc9fe741a2
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 16 16:02:39 2012 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 16:07:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=e431bc97

add xf86-video-armsoc driver

---
 x11-drivers/xf86-video-armsoc/Manifest             |    2 +
 ...paste-from-omap-driver-to-get-it-compiled.patch |  397 ++++++++++++++++++++
 .../xf86-video-armsoc-9999.ebuild                  |   25 ++
 3 files changed, 424 insertions(+), 0 deletions(-)

diff --git a/x11-drivers/xf86-video-armsoc/Manifest b/x11-drivers/xf86-video-armsoc/Manifest
new file mode 100644
index 0000000..1f62dc1
--- /dev/null
+++ b/x11-drivers/xf86-video-armsoc/Manifest
@@ -0,0 +1,2 @@
+AUX 0001-copy-paste-from-omap-driver-to-get-it-compiled.patch 13279 SHA256 f2cbd9e1f5768257070e07d0780ffccc19b911ce5de32be44161a0139e2d485c SHA512 14d3de131b219ba0dd1cb69bdc49b672091b2e7b8b59096444191a25b9c5b08ff9dcc731324bf53ef01bb74007d981fad2b4116eb5512e9530976d2a529a1c8d WHIRLPOOL 090ff889d0e5ff660d1adbc2d09824096df88932c56c00d20a658ebb8007f5c542e261ce0e19561d41a6211892f6dfc64795019658781b6cbb55315497d1dbee
+EBUILD xf86-video-armsoc-9999.ebuild 436 SHA256 67d967fd0257ccff8930e44f29d355797eaac92bb6461b71d6f6701567fbb8dc SHA512 0dfbc4087bd1bcd47efcaa447eb3095f4daf87628989055c9b48d1614d6b04e7bedf9c4fa2735079945931c2344d8f1735c4df09f06f622cdc5b9ceae82cd02f WHIRLPOOL 1d4854e0d36a55a09be41a141251f4bcca66d943c7495469f956525d1cb19abdcc5d79c9df0cf042fc53eb9bbd7879e7a5a8d59c62f825c614083a99c2029064

diff --git a/x11-drivers/xf86-video-armsoc/files/0001-copy-paste-from-omap-driver-to-get-it-compiled.patch b/x11-drivers/xf86-video-armsoc/files/0001-copy-paste-from-omap-driver-to-get-it-compiled.patch
new file mode 100644
index 0000000..a6be2bb
--- /dev/null
+++ b/x11-drivers/xf86-video-armsoc/files/0001-copy-paste-from-omap-driver-to-get-it-compiled.patch
@@ -0,0 +1,397 @@
+From 13c5cf601786c81424fa86b2180bd97e515cb51a Mon Sep 17 00:00:00 2001
+From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
+Date: Thu, 1 Nov 2012 00:16:58 +0100
+Subject: [PATCH] copy/paste from omap driver to armsoc compiled
+
+---
+ src/compat-api.h      |   99 +++++++++++++++++++++++++++++++++++++++++++++++++
+ src/drmmode_display.c |    4 +-
+ src/omap_driver.c     |   67 ++++++++++++++++-----------------
+ src/omap_driver.h     |    3 +-
+ src/omap_exa.h        |    6 ++-
+ src/omap_exa_null.c   |    4 +-
+ 6 files changed, 139 insertions(+), 44 deletions(-)
+ create mode 100644 src/compat-api.h
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+new file mode 100644
+index 0000000..ad15fa3
+--- /dev/null
++++ b/src/compat-api.h
+@@ -0,0 +1,99 @@
++/*
++ * Copyright 2012 Red Hat, Inc.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the next
++ * paragraph) shall be included in all copies or substantial portions of the
++ * Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ * DEALINGS IN THE SOFTWARE.
++ *
++ * Author: Dave Airlie <airlied@redhat.com>
++ */
++
++/* this file provides API compat between server post 1.13 and pre it,
++   it should be reused inside as many drivers as possible */
++#ifndef COMPAT_API_H
++#define COMPAT_API_H
++
++#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
++#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
++#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
++#endif
++
++#ifndef XF86_HAS_SCRN_CONV
++#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
++#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
++#endif
++
++#ifndef XF86_SCRN_INTERFACE
++
++#define SCRN_ARG_TYPE int
++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
++
++#define SCREEN_ARG_TYPE int
++#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
++
++#define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScreen, int argc, char **argv
++
++#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
++#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
++
++#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
++#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
++
++#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
++
++#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
++
++#define FREE_SCREEN_ARGS_DECL int arg, int flags
++#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0
++
++#define VT_FUNC_ARGS_DECL int arg, int flags
++#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags)
++
++#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex)
++#else
++#define SCRN_ARG_TYPE ScrnInfoPtr
++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
++
++#define SCREEN_ARG_TYPE ScreenPtr
++#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
++
++#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
++
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
++#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++
++#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
++#define CLOSE_SCREEN_ARGS pScreen
++// old ones just because
++//#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
++//#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
++
++#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
++#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
++
++#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
++#define FREE_SCREEN_ARGS(x) (x)
++
++#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
++#define VT_FUNC_ARGS(flags) pScrn
++
++#define XF86_ENABLEDISABLEFB_ARG(x) (x)
++
++#endif
++
++#endif
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index 297bd62..28aefad 100644
+--- a/src/drmmode_display.c
++++ b/src/drmmode_display.c
+@@ -1524,8 +1524,6 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
+ 
+ 	TRACE_ENTER();
+ 
+-	pScrn->canDoBGNoneRoot = TRUE;
+-
+ 	drmmode = calloc(1, sizeof *drmmode);
+ 	drmmode->fd = fd;
+ 
+@@ -1564,7 +1562,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
+ }
+ 
+ void
+-drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y, int flags)
++drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y)
+ {
+ 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+ 	xf86OutputPtr output = config->output[config->compat_output];
+diff --git a/src/omap_driver.c b/src/omap_driver.c
+index 0200990..f2b2e37 100644
+--- a/src/omap_driver.c
++++ b/src/omap_driver.c
+@@ -47,19 +47,17 @@ static const OptionInfoRec *OMAPAvailableOptions(int chipid, int busid);
+ static void OMAPIdentify(int flags);
+ static Bool OMAPProbe(DriverPtr drv, int flags);
+ static Bool OMAPPreInit(ScrnInfoPtr pScrn, int flags);
+-static Bool OMAPScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
+-		char **argv);
++static Bool OMAPScreenInit(SCREEN_INIT_ARGS_DECL);
+ static void OMAPLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
+ 		LOCO * colors, VisualPtr pVisual);
+-static Bool OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen);
++static Bool OMAPCloseScreen(CLOSE_SCREEN_ARGS_DECL);
+ static Bool OMAPCreateScreenResources(ScreenPtr pScreen);
+-static void OMAPBlockHandler(int i, pointer blockData, pointer pTimeout,
+-		pointer pReadmask);
+-static Bool OMAPSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+-static void OMAPAdjustFrame(int scrnIndex, int x, int y, int flags);
+-static Bool OMAPEnterVT(int scrnIndex, int flags);
+-static void OMAPLeaveVT(int scrnIndex, int flags);
+-static void OMAPFreeScreen(int scrnIndex, int flags);
++static void OMAPBlockHandler(BLOCKHANDLER_ARGS_DECL);
++static Bool OMAPSwitchMode(SWITCH_MODE_ARGS_DECL);
++static void OMAPAdjustFrame(ADJUST_FRAME_ARGS_DECL);
++static Bool OMAPEnterVT(VT_FUNC_ARGS_DECL);
++static void OMAPLeaveVT(VT_FUNC_ARGS_DECL);
++static void OMAPFreeScreen(FREE_SCREEN_ARGS_DECL);
+ 
+ 
+ 
+@@ -668,7 +666,7 @@ OMAPAccelInit(ScreenPtr pScreen)
+  * save state, initialize the mode, etc.
+  */
+ static Bool
+-OMAPScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
++OMAPScreenInit(SCREEN_INIT_ARGS_DECL)
+ {
+ 	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ 	OMAPPtr pOMAP = OMAPPTR(pScrn);
+@@ -786,10 +784,7 @@ OMAPScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	/* Take over the virtual terminal from the console, set the desired mode,
+ 	 * etc.:
+ 	 */
+-	if (!OMAPEnterVT(scrnIndex, 0)) {
+-		ERROR_MSG("OMAPEnterVT() failed!");
+-		goto fail;
+-	}
++	OMAPEnterVT(VT_FUNC_ARGS(0));
+ 
+ 	/* Do some XRandR initialization: */
+ 	if (!xf86CrtcScreenInit(pScreen)) {
+@@ -856,9 +851,9 @@ OMAPLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
+  * held by pScrn).
+  */
+ static Bool
+-OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen)
++OMAPCloseScreen(CLOSE_SCREEN_ARGS_DECL)
+ {
+-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ 	OMAPPtr pOMAP = OMAPPTR(pScrn);
+ 
+ 	TRACE_ENTER();
+@@ -866,12 +861,12 @@ OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen)
+ 	drmmode_screen_fini(pScrn);
+ 
+ 	if (pScrn->vtSema == TRUE) {
+-		OMAPLeaveVT(scrnIndex, 0);
++		OMAPLeaveVT(VT_FUNC_ARGS(0));
+ 	}
+ 
+ 	if (pOMAP->pOMAPEXA) {
+ 		if (pOMAP->pOMAPEXA->CloseScreen) {
+-			pOMAP->pOMAPEXA->CloseScreen(scrnIndex, pScreen);
++			pOMAP->pOMAPEXA->CloseScreen(CLOSE_SCREEN_ARGS);
+ 		}
+ 	}
+ 
+@@ -893,7 +888,7 @@ OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen)
+ 
+ 	TRACE_EXIT();
+ 
+-	return (*pScreen->CloseScreen)(scrnIndex, pScreen);
++	return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
+ }
+ 
+ 
+@@ -920,14 +915,14 @@ OMAPCreateScreenResources(ScreenPtr pScreen)
+ 
+ 
+ static void
+-OMAPBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
++OMAPBlockHandler(BLOCKHANDLER_ARGS_DECL)
+ {
+-	ScreenPtr pScreen = screenInfo.screens[i];
+-	ScrnInfoPtr pScrn = xf86Screens[i];
++	SCREEN_PTR(arg);
++	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ 	OMAPPtr pOMAP = OMAPPTR(pScrn);
+ 
+ 	swap(pOMAP, pScreen, BlockHandler);
+-	(*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
++	(*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
+ 	swap(pOMAP, pScreen, BlockHandler);
+ 
+ 	/* TODO OMAPVideoBlockHandler(), etc.. */
+@@ -940,9 +935,9 @@ OMAPBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
+  * Screen.
+  */
+ static Bool
+-OMAPSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
++OMAPSwitchMode(SWITCH_MODE_ARGS_DECL)
+ {
+-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++	SCRN_INFO_PTR(arg);
+ 	return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
+ }
+ 
+@@ -954,10 +949,10 @@ OMAPSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+  * buffer within the "viewport" of the monitor.
+  */
+ static void
+-OMAPAdjustFrame(int scrnIndex, int x, int y, int flags)
++OMAPAdjustFrame(ADJUST_FRAME_ARGS_DECL)
+ {
+-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+-	drmmode_adjust_frame(pScrn, x, y, flags);
++	SCRN_INFO_PTR(arg);
++	drmmode_adjust_frame(pScrn, x, y);
+ }
+ 
+ 
+@@ -969,9 +964,9 @@ OMAPAdjustFrame(int scrnIndex, int x, int y, int flags)
+  * HW state as needed by the X server.
+  */
+ static Bool
+-OMAPEnterVT(int scrnIndex, int flags)
++OMAPEnterVT(VT_FUNC_ARGS_DECL)
+ {
+-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++	SCRN_INFO_PTR(arg);
+ 	OMAPPtr pOMAP = OMAPPTR(pScrn);
+ 	int i, ret;
+ 
+@@ -1004,9 +999,9 @@ OMAPEnterVT(int scrnIndex, int flags)
+  * need to restore the console's HW state.
+  */
+ static void
+-OMAPLeaveVT(int scrnIndex, int flags)
++OMAPLeaveVT(VT_FUNC_ARGS_DECL)
+ {
+-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++	SCRN_INFO_PTR(arg);
+ 	OMAPPtr pOMAP = OMAPPTR(pScrn);
+ 	int i, ret;
+ 
+@@ -1033,9 +1028,9 @@ OMAPLeaveVT(int scrnIndex, int flags)
+  * up-to-and-including an unsuccessful ScreenInit() call.
+  */
+ static void
+-OMAPFreeScreen(int scrnIndex, int flags)
++OMAPFreeScreen(FREE_SCREEN_ARGS_DECL)
+ {
+-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++	SCRN_INFO_PTR(arg);
+ 	OMAPPtr pOMAP = OMAPPTR(pScrn);
+ 
+ 	TRACE_ENTER();
+@@ -1047,7 +1042,7 @@ OMAPFreeScreen(int scrnIndex, int flags)
+ 
+ 	if (pOMAP->pOMAPEXA) {
+ 		if (pOMAP->pOMAPEXA->FreeScreen) {
+-			pOMAP->pOMAPEXA->FreeScreen(scrnIndex, flags);
++			pOMAP->pOMAPEXA->FreeScreen(FREE_SCREEN_ARGS(pScrn));
+ 		}
+ 		free(pOMAP->pOMAPEXA);
+ 	}
+diff --git a/src/omap_driver.h b/src/omap_driver.h
+index f24479e..d27d2da 100644
+--- a/src/omap_driver.h
++++ b/src/omap_driver.h
+@@ -61,6 +61,7 @@
+ 
+ #include <errno.h>
+ 
++#include "compat-api.h"
+ #include "omap_exa.h"
+ 
+ 
+@@ -236,7 +237,7 @@ static inline Bool has_dmm(OMAPPtr pOMAP)
+ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
+ void drmmode_screen_init(ScrnInfoPtr pScrn);
+ void drmmode_screen_fini(ScrnInfoPtr pScrn);
+-void drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y, int flags);
++void drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y);
+ int drmmode_page_flip(DrawablePtr draw, uint32_t fb_id, void *priv);
+ void drmmode_wait_for_event(ScrnInfoPtr pScrn);
+ Bool drmmode_cursor_init(ScreenPtr pScreen);
+diff --git a/src/omap_exa.h b/src/omap_exa.h
+index 9980858..2c76807 100644
+--- a/src/omap_exa.h
++++ b/src/omap_exa.h
+@@ -37,6 +37,8 @@
+ #include "omap_util.h"
+ #include "exa.h"
+ 
++#include "compat-api.h"
++
+ /**
+  * A per-Screen structure used to communicate and coordinate between the OMAP X
+  * driver and an external EXA sub-module (if loaded).
+@@ -50,14 +52,14 @@ typedef struct _OMAPEXARec
+ 	 * generation to free per-Screen data structures (except those held by
+ 	 * pScrn).
+ 	 */
+-	Bool (*CloseScreen)(int scrnIndex, ScreenPtr pScreen);
++	Bool (*CloseScreen)(CLOSE_SCREEN_ARGS_DECL);
+ 
+ 	/**
+ 	 * Called by X driver's FreeScreen() function at the end of each server
+ 	 * lifetime to free per-ScrnInfoRec data structures, to close any external
+ 	 * connections (e.g. with PVR2D, DRM), etc.
+ 	 */
+-	void (*FreeScreen)(int scrnIndex, int flags);
++	void (*FreeScreen)(FREE_SCREEN_ARGS_DECL);
+ 
+ 	/** get formats supported by PutTextureImage() (for dri2 video..) */
+ #define MAX_FORMATS 16
+diff --git a/src/omap_exa_null.c b/src/omap_exa_null.c
+index 7d1f295..3c1e683 100644
+--- a/src/omap_exa_null.c
++++ b/src/omap_exa_null.c
+@@ -77,7 +77,7 @@ PrepareCompositeFail(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
+ }
+ 
+ static Bool
+-CloseScreen(int scrnIndex, ScreenPtr pScreen)
++CloseScreen(CLOSE_SCREEN_ARGS_DECL)
+ {
+ #if 0 // TODO need to change CloseScreen/FreeScreen ..
+ 	exaDriverFini(pScreen);
+@@ -87,7 +87,7 @@ CloseScreen(int scrnIndex, ScreenPtr pScreen)
+ }
+ 
+ static void
+-FreeScreen(int scrnIndex, int flags)
++FreeScreen(FREE_SCREEN_ARGS_DECL)
+ {
+ }
+ 
+-- 
+1.7.10.4
+

diff --git a/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild b/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild
new file mode 100644
index 0000000..2a1682b
--- /dev/null
+++ b/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+EGIT_REPO_URI="https://git.chromium.org/git/chromiumos/third_party/xf86-video-armsoc.git"
+
+inherit xorg-2
+
+DESCRIPTION=""
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~arm"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/0001-copy-paste-from-omap-driver-to-get-it-compiled.patch
+)