xf86-video-scfb-dfbsd: Import xf86-video-scfb 0.0.4 as wip/xf86-video-scfb-dfbsd

[David Shao <davshao%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	David Shao <davshao%gmail.com@localhost>
Pushed By:	dshao
Date:		Sun Mar 3 14:16:00 2019 -0800
Changeset:	2faf4c2b05e2115ee5cdd2a545eee31c30ce553a

Modified Files:
	Makefile
Added Files:
	xf86-video-scfb-dfbsd/DESCR
	xf86-video-scfb-dfbsd/Makefile
	xf86-video-scfb-dfbsd/PLIST
	xf86-video-scfb-dfbsd/distinfo
	xf86-video-scfb-dfbsd/patches/patch-src_compat-api.h
	xf86-video-scfb-dfbsd/patches/patch-src_scfb__driver.c

Log Message:
xf86-video-scfb-dfbsd: Import xf86-video-scfb 0.0.4 as wip/xf86-video-scfb-dfbsd

From FreeBSD ports.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2faf4c2b05e2115ee5cdd2a545eee31c30ce553a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |   1 +
 xf86-video-scfb-dfbsd/DESCR                        |   2 +
 xf86-video-scfb-dfbsd/Makefile                     |  24 ++
 xf86-video-scfb-dfbsd/PLIST                        |   3 +
 xf86-video-scfb-dfbsd/distinfo                     |   8 +
 .../patches/patch-src_compat-api.h                 | 102 ++++++++
 .../patches/patch-src_scfb__driver.c               | 284 +++++++++++++++++++++
 7 files changed, 424 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 9d5ec52468..5b3875e7a9 100644
--- a/Makefile
+++ b/Makefile
@@ -4852,6 +4852,7 @@ SUBDIR+=	xf86-video-geode
 SUBDIR+=	xf86-video-intel-dfbsd
 SUBDIR+=	xf86-video-intel-git
 SUBDIR+=	xf86-video-intel-old
+SUBDIR+=	xf86-video-scfb-dfbsd
 SUBDIR+=	xf86-video-virtualbox
 SUBDIR+=	xf86rushproto
 SUBDIR+=	xfs
diff --git a/xf86-video-scfb-dfbsd/DESCR b/xf86-video-scfb-dfbsd/DESCR
new file mode 100644
index 0000000000..659da4a8c1
--- /dev/null
+++ b/xf86-video-scfb-dfbsd/DESCR
@@ -0,0 +1,2 @@
+This package contains the X.Org xf86-video-scfb driver.
+Framebuffer access via FreeBSD syscons.
diff --git a/xf86-video-scfb-dfbsd/Makefile b/xf86-video-scfb-dfbsd/Makefile
new file mode 100644
index 0000000000..558c9a9a30
--- /dev/null
+++ b/xf86-video-scfb-dfbsd/Makefile
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.17 2016/02/26 11:27:21 jperkin Exp $
+
+PORTNAME=	xf86-video-scfb
+PORTVERSION=	0.0.4
+
+DISTNAME=	${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=rayddteam/}
+GITHUB_TAG=	bdeb3bf153d6f841f15990119c07ee349c29866a
+
+CATEGORIES=	x11
+# EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc%NetBSD.org@localhost
+COMMENT=	X.Org syscons display driver
+
+ONLY_FOR_PLATFORM=	FreeBSD-*-* DragonFly-*-*
+
+USE_LIBTOOL=	YES
+GNU_CONFIGURE=	YES
+USE_TOOLS+=	pkg-config
+
+.include "../../x11/modular-xorg-server/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/xf86-video-scfb-dfbsd/PLIST b/xf86-video-scfb-dfbsd/PLIST
new file mode 100644
index 0000000000..f109f10eef
--- /dev/null
+++ b/xf86-video-scfb-dfbsd/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD$
+lib/xorg/modules/drivers/scfb_drv.la
+man/man4/scfb.4
diff --git a/xf86-video-scfb-dfbsd/distinfo b/xf86-video-scfb-dfbsd/distinfo
new file mode 100644
index 0000000000..0de23db5a5
--- /dev/null
+++ b/xf86-video-scfb-dfbsd/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+SHA1 (xf86-video-scfb-0.0.4-bdeb3bf153d6f841f15990119c07ee349c29866a.tar.gz) = 34c2544737e11a04b72076f392e36a16f992d32f
+RMD160 (xf86-video-scfb-0.0.4-bdeb3bf153d6f841f15990119c07ee349c29866a.tar.gz) = 3d71b7126cb1af30eabfffdc724788e2cc5a75f1
+SHA512 (xf86-video-scfb-0.0.4-bdeb3bf153d6f841f15990119c07ee349c29866a.tar.gz) = f52daa1854092f1b9fd115ff832f70f42975cd3f8ce7ae4256e62493d60ecfae015b30101af13d3dc39d5f232f23e617df233367f440b2f6f6af244654a6e416
+Size (xf86-video-scfb-0.0.4-bdeb3bf153d6f841f15990119c07ee349c29866a.tar.gz) = 345378 bytes
+SHA1 (patch-src_compat-api.h) = 33b696764ff7e09f5ba22fe8c79d76b1112f0ccd
+SHA1 (patch-src_scfb__driver.c) = 616e21e151cb5323b1e06de4b18f37a2dc2c61f7
diff --git a/xf86-video-scfb-dfbsd/patches/patch-src_compat-api.h b/xf86-video-scfb-dfbsd/patches/patch-src_compat-api.h
new file mode 100644
index 0000000000..a4e9815d72
--- /dev/null
+++ b/xf86-video-scfb-dfbsd/patches/patch-src_compat-api.h
@@ -0,0 +1,102 @@
+--- src/compat-api.h.orig	2014-11-23 09:47:32 UTC
++++ 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@localhost>
++ */
++
++/* 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 i, 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 ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
++
++#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
++#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
++
++#define FREE_SCREEN_ARGS_DECL int arg, int flags
++
++#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
++
++#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
++#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
++
++#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
++#define SWITCH_MODE_ARGS(arg, m) arg, m
++
++#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
++
++#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
++#define VT_FUNC_ARGS(flags) pScrn
++
++#define XF86_ENABLEDISABLEFB_ARG(x) (x)
++
++#endif
++
++#endif
diff --git a/xf86-video-scfb-dfbsd/patches/patch-src_scfb__driver.c b/xf86-video-scfb-dfbsd/patches/patch-src_scfb__driver.c
new file mode 100644
index 0000000000..f1cd3365fb
--- /dev/null
+++ b/xf86-video-scfb-dfbsd/patches/patch-src_scfb__driver.c
@@ -0,0 +1,284 @@
+$NetBSD$
+
+Replace LoaderGetOS with ifdef
+commit	8069c6970c731c38e105f5dddd5ce83ba88b0773
+
+https://cgit.freedesktop.org/xorg/driver/xf86-video-wsfb/commit/?id=8069c6970c731c38e105f5dddd5ce83ba88b0773
+
+--- src/scfb_driver.c.orig	2014-07-19 22:22:29.000000000 +0000
++++ src/scfb_driver.c
+@@ -55,7 +55,6 @@
+ #include "xf86Priv.h"
+ 
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "micmap.h"
+ #include "colormapst.h"
+ #include "xf86cmap.h"
+@@ -80,6 +79,8 @@
+ #include "xf86xv.h"
+ #endif
+ 
++#include "compat-api.h"
++
+ #undef	DEBUG
+ #define	DEBUG	1
+ 
+@@ -101,15 +102,15 @@ static const OptionInfoRec * ScfbAvailab
+ static void ScfbIdentify(int);
+ static Bool ScfbProbe(DriverPtr, int);
+ static Bool ScfbPreInit(ScrnInfoPtr, int);
+-static Bool ScfbScreenInit(int, ScreenPtr, int, char **);
+-static Bool ScfbCloseScreen(int, ScreenPtr);
++static Bool ScfbScreenInit(SCREEN_INIT_ARGS_DECL);
++static Bool ScfbCloseScreen(CLOSE_SCREEN_ARGS_DECL);
+ static void *ScfbWindowLinear(ScreenPtr, CARD32, CARD32, int, CARD32 *,
+ 			      void *);
+-static void ScfbPointerMoved(int, int, int);
+-static Bool ScfbEnterVT(int, int);
+-static void ScfbLeaveVT(int, int);
+-static Bool ScfbSwitchMode(int, DisplayModePtr, int);
+-static int ScfbValidMode(int, DisplayModePtr, Bool, int);
++static void ScfbPointerMoved(SCRN_ARG_TYPE, int, int);
++static Bool ScfbEnterVT(VT_FUNC_ARGS_DECL);
++static void ScfbLeaveVT(VT_FUNC_ARGS_DECL);
++static Bool ScfbSwitchMode(SWITCH_MODE_ARGS_DECL);
++static int ScfbValidMode(SCRN_ARG_TYPE, DisplayModePtr, Bool, int);
+ static void ScfbLoadPalette(ScrnInfoPtr, int, int *, LOCO *, VisualPtr);
+ static Bool ScfbSaveScreen(ScreenPtr, int);
+ static void ScfbSave(ScrnInfoPtr);
+@@ -195,18 +196,24 @@ static pointer
+ ScfbSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+ {
+ 	static Bool setupDone = FALSE;
++#if 0
+ 	const char *osname;
+ 
+ 	/* Check that we're being loaded on a OpenBSD or NetBSD system. */
+ 	LoaderGetOS(&osname, NULL, NULL, NULL);
+ 	if (!osname || (strcmp(osname, "freebsd") != 0 && strcmp(osname, "openbsd") != 0 &&
+-	                strcmp(osname, "netbsd") != 0)) {
++	                strcmp(osname, "netbsd") != 0 && strcmp(osname, "dragonfly") != 0)) {
+ 		if (errmaj)
+ 			*errmaj = LDR_BADOS;
+ 		if (errmin)
+ 			*errmin = 0;
+ 		return NULL;
+ 	}
++#endif
++#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
++	return NULL;
++#endif
++
+ 	if (!setupDone) {
+ 		setupDone = TRUE;
+ 		xf86AddDriver(&SCFB, module, HaveDriverFuncs);
+@@ -231,7 +238,7 @@ typedef struct {
+ 	void *			shadow;
+ 	CloseScreenProcPtr	CloseScreen;
+ 	CreateScreenResourcesProcPtr CreateScreenResources;
+-	void			(*PointerMoved)(int, int, int);
++	void			(*PointerMoved)(SCRN_ARG_TYPE, int, int);
+ 	EntityInfoPtr		pEnt;
+ 
+ #ifdef XFreeXDGA
+@@ -302,7 +309,7 @@ scfb_mmap(size_t len, off_t off, int fd)
+ 		mapaddr = NULL;
+ 	}
+ #if DEBUG
+-	ErrorF("mmap returns: addr %p len 0x%x, fd %d, off %x\n", mapaddr, mapsize, fd, off);
++	ErrorF("mmap returns: addr %p len 0x%x, fd %d, off %lx\n", mapaddr, mapsize, fd, off);
+ #endif
+ 	return mapaddr;
+ }
+@@ -314,6 +321,7 @@ ScfbProbe(DriverPtr drv, int flags)
+        	GDevPtr *devSections;
+ 	int numDevSections;
+ 	const char *dev;
++	struct fbtype fb;
+ 	Bool foundScreen = FALSE;
+ 
+ 	TRACE("probe start");
+@@ -330,7 +338,8 @@ ScfbProbe(DriverPtr drv, int flags)
+ 	for (i = 0; i < numDevSections; i++) {
+ 		ScrnInfoPtr pScrn = NULL;
+ 		dev = xf86FindOptionValue(devSections[i]->options, "device");
+-		if ((fd = xf86Info.consoleFd) >= 0) {
++		if ((fd = xf86Info.consoleFd) >= 0 &&
++		    ioctl(fd, FBIOGTYPE, &fb) != -1) {
+ 			entity = xf86ClaimFbSlot(drv, 0, devSections[i], TRUE);
+ 			pScrn = xf86ConfigFbEntity(NULL,0,entity,
+ 						   NULL,NULL,NULL,NULL);
+@@ -366,8 +375,8 @@ ScfbPreInit(ScrnInfoPtr pScrn, int flags
+ 	struct fbtype fb;
+ 	int default_depth, wstype;
+ 	const char *dev;
+-	char *mod = NULL, *s;
+-	const char *reqSym = NULL;
++	char *mod = NULL;
++	const char *reqSym = NULL, *s;
+ 	Gamma zeros = {0.0, 0.0, 0.0};
+ 	DisplayModePtr mode;
+ 
+@@ -633,9 +642,9 @@ ScfbShadowInit(ScreenPtr pScreen)
+ }
+ 
+ static Bool
+-ScfbScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
++ScfbScreenInit(SCREEN_INIT_ARGS_DECL)
+ {
+-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
++	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ 	ScfbPtr fPtr = SCFBPTR(pScrn);
+ 	VisualPtr visual;
+ 	int ret, flags, ncolors;
+@@ -792,7 +801,7 @@ ScfbScreenInit(int scrnIndex, ScreenPtr
+ 				   "RENDER extension initialisation failed.");
+ 	}
+ 	if (fPtr->shadowFB && !ScfbShadowInit(pScreen)) {
+-		xf86DrvMsg(scrnIndex, X_ERROR,
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 		    "shadow framebuffer initialization failed\n");
+ 		return FALSE;
+ 	}
+@@ -801,20 +810,19 @@ ScfbScreenInit(int scrnIndex, ScreenPtr
+ 	if (!fPtr->rotate)
+ 		ScfbDGAInit(pScrn, pScreen);
+ 	else
+-		xf86DrvMsg(scrnIndex, X_INFO, "Rotated display, "
++		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Rotated display, "
+ 		    "disabling DGA\n");
+ #endif
+ 	if (fPtr->rotate) {
+-		xf86DrvMsg(scrnIndex, X_INFO, "Enabling Driver Rotation, "
++		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Enabling Driver Rotation, "
+ 		    "disabling RandR\n");
+ 		xf86DisableRandR();
+ 		if (pScrn->bitsPerPixel == 24)
+-			xf86DrvMsg(scrnIndex, X_WARNING,
++			xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ 			    "Rotation might be broken in 24 bpp\n");
+ 	}
+ 
+ 	xf86SetBlackWhitePixels(pScreen);
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ 
+ 	/* Software cursor. */
+@@ -858,9 +866,9 @@ ScfbScreenInit(int scrnIndex, ScreenPtr
+ }
+ 
+ static Bool
+-ScfbCloseScreen(int scrnIndex, ScreenPtr pScreen)
++ScfbCloseScreen(CLOSE_SCREEN_ARGS_DECL)
+ {
+-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ 	PixmapPtr pPixmap;
+ 	ScfbPtr fPtr = SCFBPTR(pScrn);
+ 
+@@ -892,7 +900,7 @@ ScfbCloseScreen(int scrnIndex, ScreenPtr
+ 	/* Unwrap CloseScreen. */
+ 	pScreen->CloseScreen = fPtr->CloseScreen;
+ 	TRACE_EXIT("ScfbCloseScreen");
+-	return (*pScreen->CloseScreen)(scrnIndex, pScreen);
++	return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
+ }
+ 
+ static void *
+@@ -907,9 +915,9 @@ ScfbWindowLinear(ScreenPtr pScreen, CARD
+ }
+ 
+ static void
+-ScfbPointerMoved(int index, int x, int y)
++ScfbPointerMoved(SCRN_ARG_TYPE arg, int x, int y)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[index];
++    SCRN_INFO_PTR(arg);
+     ScfbPtr fPtr = SCFBPTR(pScrn);
+     int newX, newY;
+ 
+@@ -941,13 +949,13 @@ ScfbPointerMoved(int index, int x, int y
+     }
+ 
+     /* Pass adjusted pointer coordinates to wrapped PointerMoved function. */
+-    (*fPtr->PointerMoved)(index, newX, newY);
++    (*fPtr->PointerMoved)(arg, newX, newY);
+ }
+ 
+ static Bool
+-ScfbEnterVT(int scrnIndex, int flags)
++ScfbEnterVT(VT_FUNC_ARGS_DECL)
+ {
+-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++	SCRN_INFO_PTR(arg);
+ 
+ 	TRACE_ENTER("EnterVT");
+ 	pScrn->vtSema = TRUE;
+@@ -956,20 +964,20 @@ ScfbEnterVT(int scrnIndex, int flags)
+ }
+ 
+ static void
+-ScfbLeaveVT(int scrnIndex, int flags)
++ScfbLeaveVT(VT_FUNC_ARGS_DECL)
+ {
+ #if DEBUG
+-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++	SCRN_INFO_PTR(arg);
+ #endif
+ 
+ 	TRACE_ENTER("LeaveVT");
+ }
+ 
+ static Bool
+-ScfbSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
++ScfbSwitchMode(SWITCH_MODE_ARGS_DECL)
+ {
+ #if DEBUG
+-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++	SCRN_INFO_PTR(arg);
+ #endif
+ 
+ 	TRACE_ENTER("SwitchMode");
+@@ -978,10 +986,10 @@ ScfbSwitchMode(int scrnIndex, DisplayMod
+ }
+ 
+ static int
+-ScfbValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
++ScfbValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
+ {
+ #if DEBUG
+-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++	SCRN_INFO_PTR(arg);
+ #endif
+ 
+ 	TRACE_ENTER("ValidMode");
+@@ -1067,7 +1075,6 @@ static Bool
+ ScfbDGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode)
+ {
+ 	DisplayModePtr pMode;
+-	int scrnIdx = pScrn->pScreen->myNum;
+ 	int frameX0, frameY0;
+ 
+ 	if (pDGAMode) {
+@@ -1081,9 +1088,9 @@ ScfbDGASetMode(ScrnInfoPtr pScrn, DGAMod
+ 		frameY0 = pScrn->frameY0;
+ 	}
+ 
+-	if (!(*pScrn->SwitchMode)(scrnIdx, pMode, 0))
++	if (!(*pScrn->SwitchMode)(SWITCH_MODE_ARGS(pScrn, pMode)))
+ 		return FALSE;
+-	(*pScrn->AdjustFrame)(scrnIdx, frameX0, frameY0, 0);
++	(*pScrn->AdjustFrame)(ADJUST_FRAME_ARGS(pScrn, frameX0, frameY0));
+ 
+ 	return TRUE;
+ }
+@@ -1091,7 +1098,7 @@ ScfbDGASetMode(ScrnInfoPtr pScrn, DGAMod
+ static void
+ ScfbDGASetViewport(ScrnInfoPtr pScrn, int x, int y, int flags)
+ {
+-	(*pScrn->AdjustFrame)(pScrn->pScreen->myNum, x, y, flags);
++	(*pScrn->AdjustFrame)(ADJUST_FRAME_ARGS(pScrn, x, y));
+ }
+ 
+ static int