xserver-xorg-video-dummy: Changes to 'upstream-unstable'
autogen.sh | 4 ++
configure.ac | 5 +--
src/dummy_driver.c | 72 ++++-------------------------------------------------
3 files changed, 11 insertions(+), 70 deletions(-)
New commits:
commit 4a6df6b4eecae769771eba0136bf8271d01258fb
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 14 21:57:18 2016 +0100
xf86-video-dummy 0.3.8
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/configure.ac b/configure.ac
index 30cf405..4eb7fae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-dummy],
- [0.3.7],
+ [0.3.8],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-dummy])
AC_CONFIG_SRCDIR([Makefile.am])
commit 52a6346c63c20c79f54c34e2950ccc5f1d2fb138
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 14 21:59:29 2016 +0100
configure: require xorg-server 1.4.99.901
dixChangeWindowProperty was introduced in that release.
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/configure.ac b/configure.ac
index 005611d..30cf405 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@ AC_SUBST([DGA])
AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])
# Obtain compiler/linker options for the driver dependencies
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4.99.901] xproto fontsproto $REQUIRED_MODULES)
# Checks for libraries.
commit e434975017eb90fa702653592ae590bc22aa483c
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Sep 22 09:14:26 2016 -0700
Remove pointless empty functions
These functions might be useful in a real driver, but with no
hardware, they're pointless. Get rid of them.
v2: Rebase, get rid of pointless calls to DUMMYAdjustFrame, return TRUE from
DUMMYSwitchMode.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Antoine Martin <antoine@nagafix.co.uk>
Tested-by: Antoine Martin <antoine@nagafix.co.uk>
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index cf15053..2656602 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -65,9 +65,6 @@ static ModeStatus DUMMYValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode,
static Bool DUMMYSaveScreen(ScreenPtr pScreen, int mode);
/* Internally used functions */
-static Bool dummyModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
-static void dummySave(ScrnInfoPtr pScrn);
-static void dummyRestore(ScrnInfoPtr pScrn, Bool restoreText);
static Bool dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
pointer ptr);
@@ -461,14 +458,6 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags)
static Bool
DUMMYEnterVT(VT_FUNC_ARGS_DECL)
{
- SCRN_INFO_PTR(arg);
-
- /* Should we re-save the text mode on each VT enter? */
- if(!dummyModeInit(pScrn, pScrn->currentMode))
- return FALSE;
-
- DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
-
return TRUE;
}
@@ -476,8 +465,6 @@ DUMMYEnterVT(VT_FUNC_ARGS_DECL)
static void
DUMMYLeaveVT(VT_FUNC_ARGS_DECL)
{
- SCRN_INFO_PTR(arg);
- dummyRestore(pScrn, TRUE);
}
static void
@@ -535,15 +522,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
if (!(dPtr->FBBase = malloc(pScrn->videoRam * 1024)))
return FALSE;
-
- /*
- * next we save the current state and setup the first mode
- */
- dummySave(pScrn);
-
- if (!dummyModeInit(pScrn,pScrn->currentMode))
- return FALSE;
- DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
/*
* Reset visual list.
@@ -665,8 +643,7 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
Bool
DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL)
{
- SCRN_INFO_PTR(arg);
- return dummyModeInit(pScrn, mode);
+ return TRUE;
}
/* Mandatory */
@@ -683,7 +660,6 @@ DUMMYCloseScreen(CLOSE_SCREEN_ARGS_DECL)
DUMMYPtr dPtr = DUMMYPTR(pScrn);
if(pScrn->vtSema){
- dummyRestore(pScrn, TRUE);
free(dPtr->FBBase);
}
@@ -725,24 +701,6 @@ DUMMYValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
return(MODE_OK);
}
-static void
-dummySave(ScrnInfoPtr pScrn)
-{
-}
-
-static void
-dummyRestore(ScrnInfoPtr pScrn, Bool restoreText)
-{
-}
-
-static Bool
-dummyModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-{
- dummyRestore(pScrn, FALSE);
-
- return(TRUE);
-}
-
Atom VFB_PROP = 0;
#define VFB_PROP_NAME "VFB_IDENT"
commit 367c778240b4266958f33cec3653d5389e283557
Author: Antoine Martin <antoine@nagafix.co.uk>
Date: Tue Sep 20 13:34:40 2016 +0700
remove dead code in dummy driver
Signed-off-by: Antoine Martin <antoine@nagafix.co.uk>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 9d4d5bf..cf15053 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -673,25 +673,6 @@ DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL)
void
DUMMYAdjustFrame(ADJUST_FRAME_ARGS_DECL)
{
- SCRN_INFO_PTR(arg);
- int Base;
-
- Base = (y * pScrn->displayWidth + x) >> 2;
-
- /* Scale Base by the number of bytes per pixel. */
- switch (pScrn->depth) {
- case 8 :
- break;
- case 15 :
- case 16 :
- Base *= 2;
- break;
- case 24 :
- Base *= 3;
- break;
- default :
- break;
- }
}
/* Mandatory */
commit 8706f60ab457867c120dd44e812b8fadc2be7179
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 14 10:30:40 2016 +1000
Switch to using dixChangeWindowProperty
eb36924ead40564325aa56d54a973dc8fb4eae83 removed ChangeWindowProperty from the
server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 470e125..9d4d5bf 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -790,8 +790,9 @@ DUMMYCreateWindow(WindowPtr pWin)
if (! ValidAtom(VFB_PROP))
VFB_PROP = MakeAtom(VFB_PROP_NAME, strlen(VFB_PROP_NAME), 1);
- ret = ChangeWindowProperty(pWinRoot, VFB_PROP, XA_STRING,
- 8, PropModeReplace, (int)4, (pointer)"TRUE", FALSE);
+ ret = dixChangeWindowProperty(serverClient, pWinRoot, VFB_PROP,
+ XA_STRING, 8, PropModeReplace,
+ (int)4, (pointer)"TRUE", FALSE);
if( ret != Success)
ErrorF("Could not set VFB root window property");
dPtr->prop = TRUE;
commit 29433844c8b8989ea2ac64bd92b3ad61b6f9cf10
Author: Antoine Martin <antoine@nagafix.co.uk>
Date: Thu Sep 17 10:55:25 2015 -0400
Honor DacSpeed setting in xorg.conf
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Antoine Martin <antoine@nagafix.co.uk>
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 6062c39..470e125 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -281,7 +281,7 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags)
ClockRangePtr clockRanges;
int i;
DUMMYPtr dPtr;
- int maxClock = 230000;
+ int maxClock = 300000;
GDevPtr device = xf86GetEntityInfo(pScrn->entityList[0])->device;
if (flags & PROBE_DETECT)
@@ -391,7 +391,7 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags)
clockRanges->next = NULL;
clockRanges->ClockMulFactor = 1;
clockRanges->minClock = 11000; /* guessed §§§ */
- clockRanges->maxClock = 300000;
+ clockRanges->maxClock = maxClock;
clockRanges->clockIndex = -1; /* programmable */
clockRanges->interlaceAllowed = TRUE;
clockRanges->doubleScanAllowed = TRUE;
commit 0e339b256a858bfd832c92e3c14619023dea826c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat May 31 21:39:32 2014 -0700
autogen.sh: Honor NOCONFIGURE=1
See http://people.gnome.org/~walters/docs/build-api.txt
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/autogen.sh b/autogen.sh
index 354f254..fc34bd5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,6 @@ cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
-$srcdir/configure "$@"
+if test -z "$NOCONFIGURE"; then
+ $srcdir/configure "$@"
+fi
commit 85402253d0f9ca464d54336e48e9a7ac91fc39bb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat May 31 21:38:41 2014 -0700
configure: Drop AM_MAINTAINER_MODE
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/autogen.sh b/autogen.sh
index 904cd67..354f254 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,4 @@ cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
-$srcdir/configure --enable-maintainer-mode "$@"
+$srcdir/configure "$@"
diff --git a/configure.ac b/configure.ac
index 06e6d87..005611d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,6 @@ AC_CONFIG_AUX_DIR(.)
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
Reply to: