Update to xf86-video-dummy 0.3.8

This commit is contained in:
matthieu 2017-01-02 16:40:02 +00:00
parent f0c1142d0d
commit c438d527c7
5 changed files with 112 additions and 116 deletions

View File

@ -1,3 +1,87 @@
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>
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>
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>
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>
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>
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>
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>
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>
commit 4160421c642fc6b2dd3100a06f236efc6bbe0e08
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 9 19:45:23 2013 +0200

View File

@ -72,7 +72,7 @@ host_triplet = @host@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog config.guess \
$(top_srcdir)/configure COPYING ChangeLog compile config.guess \
config.sub depcomp install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac

View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for xf86-video-dummy 0.3.7.
# Generated by GNU Autoconf 2.69 for xf86-video-dummy 0.3.8.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xf86-video-dummy'
PACKAGE_TARNAME='xf86-video-dummy'
PACKAGE_VERSION='0.3.7'
PACKAGE_STRING='xf86-video-dummy 0.3.7'
PACKAGE_VERSION='0.3.8'
PACKAGE_STRING='xf86-video-dummy 0.3.8'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@ -1353,7 +1353,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures xf86-video-dummy 0.3.7 to adapt to many kinds of systems.
\`configure' configures xf86-video-dummy 0.3.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1424,7 +1424,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of xf86-video-dummy 0.3.7:";;
short | recursive ) echo "Configuration of xf86-video-dummy 0.3.8:";;
esac
cat <<\_ACEOF
@ -1547,7 +1547,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
xf86-video-dummy configure 0.3.7
xf86-video-dummy configure 0.3.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1871,7 +1871,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by xf86-video-dummy $as_me 0.3.7, which was
It was created by xf86-video-dummy $as_me 0.3.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -2700,7 +2700,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-dummy'
VERSION='0.3.7'
VERSION='0.3.8'
cat >>confdefs.h <<_ACEOF
@ -2747,29 +2747,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then :
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
else
USE_MAINTAINER_MODE=no
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
else
MAINTAINER_MODE_TRUE='#'
MAINTAINER_MODE_FALSE=
fi
MAINT=$MAINTAINER_MODE_TRUE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
@ -17813,12 +17790,12 @@ if test -n "$XORG_CFLAGS"; then
pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.0.99.901 xproto fontsproto \$REQUIRED_MODULES\""; } >&5
($PKG_CONFIG --exists --print-errors "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES") 2>&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.4.99.901 xproto fontsproto \$REQUIRED_MODULES\""; } >&5
($PKG_CONFIG --exists --print-errors "xorg-server >= 1.4.99.901 xproto fontsproto $REQUIRED_MODULES") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.4.99.901 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@ -17830,12 +17807,12 @@ if test -n "$XORG_LIBS"; then
pkg_cv_XORG_LIBS="$XORG_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.0.99.901 xproto fontsproto \$REQUIRED_MODULES\""; } >&5
($PKG_CONFIG --exists --print-errors "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES") 2>&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.4.99.901 xproto fontsproto \$REQUIRED_MODULES\""; } >&5
($PKG_CONFIG --exists --print-errors "xorg-server >= 1.4.99.901 xproto fontsproto $REQUIRED_MODULES") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.4.99.901 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@ -17856,14 +17833,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES" 2>&1`
XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xorg-server >= 1.4.99.901 xproto fontsproto $REQUIRED_MODULES" 2>&1`
else
XORG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES" 2>&1`
XORG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xorg-server >= 1.4.99.901 xproto fontsproto $REQUIRED_MODULES" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$XORG_PKG_ERRORS" >&5
as_fn_error $? "Package requirements (xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES) were not met:
as_fn_error $? "Package requirements (xorg-server >= 1.4.99.901 xproto fontsproto $REQUIRED_MODULES) were not met:
$XORG_PKG_ERRORS
@ -18029,10 +18006,6 @@ else
am__EXEEXT_FALSE=
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@ -18446,7 +18419,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by xf86-video-dummy $as_me 0.3.7, which was
This file was extended by xf86-video-dummy $as_me 0.3.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -18512,7 +18485,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
xf86-video-dummy config.status 0.3.7
xf86-video-dummy config.status 0.3.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

View File

@ -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])
@ -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],
@ -67,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.

View File

@ -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);
@ -281,7 +278,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 +388,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;
@ -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
@ -536,15 +523,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,33 +643,13 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
Bool
DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL)
{
SCRN_INFO_PTR(arg);
return dummyModeInit(pScrn, mode);
return TRUE;
}
/* Mandatory */
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 */
@ -702,7 +660,6 @@ DUMMYCloseScreen(CLOSE_SCREEN_ARGS_DECL)
DUMMYPtr dPtr = DUMMYPTR(pScrn);
if(pScrn->vtSema){
dummyRestore(pScrn, TRUE);
free(dPtr->FBBase);
}
@ -744,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"
@ -790,8 +729,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;