Hello community,
here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory
checked in at Wed Nov 10 18:58:28 CET 2010.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2010-11-06 01:23:54.000000000 +0100
+++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2010-11-09 17:37:43.000000000 +0100
@@ -1,0 +2,26 @@
+Tue Nov 9 15:15:03 UTC 2010 - sndirsch@novell.com
+
+- xf86-video-vmware 11.0.3
+ * This is a bugfix release that addresses a number of bugs as
+ well as build failures on Servers 1.0 through 1.9
+
+-------------------------------------------------------------------
+Tue Nov 9 10:11:22 UTC 2010 - sndirsch@novell.com
+
+- xf86-video-geode 2.11.10
+ * fix the DCON verification loop for LX output
+ * Add get_crtc output function
+ * Don't power down DCON when it is frozen
+ * Replace xalloc/xrealloc/xfree/xcalloc with malloc/realloc/free/
+ calloc
+ * Mode Validation support on modeline in xorg.conf
+ * Fix a typo on resolution parameter
+ * Add resolution 1024x600 support for PANEL
+ * Revise the entry for 1024x600
+ * Simplify the mode_valid function
+ * Modify rotation pitch & reallocate pixmap for bo
+ * Allocate video memory with exaOffscreenAlloc
+ * Revert "Simplify the mode_valid function"
+ * lx_display: fix typo
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xf86-video-geode-2.11.9.tar.bz2
xf86-video-vmware-11.0.2.tar.bz2
New:
----
xf86-video-geode-2.11.10.tar.bz2
xf86-video-vmware-11.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.wWpRB0/_old 2010-11-10 18:48:57.000000000 +0100
+++ /var/tmp/diff_new_pack.wWpRB0/_new 2010-11-10 18:48:57.000000000 +0100
@@ -23,7 +23,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 29
+Release: 30
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -63,12 +63,12 @@
Source36: xf86-video-tseng-1.2.4.tar.bz2
Source37: xf86-video-v4l-0.2.0.tar.bz2
Source38: xf86-video-vesa-2.3.0.tar.bz2
-Source41: xf86-video-vmware-11.0.2.tar.bz2
+Source41: xf86-video-vmware-11.0.3.tar.bz2
Source42: xf86-video-voodoo-1.2.4.tar.bz2
Source44: HALlib-4.1.tar.gz
Source45: xf86-video-intel-2.13.901.tar.bz2
Source46: xf86-video-ati-6.13.2.tar.bz2
-Source51: xf86-video-geode-2.11.9.tar.bz2
+Source51: xf86-video-geode-2.11.10.tar.bz2
Source54: xf86-video-mach64-6.8.2.tar.bz2
Source55: xf86-video-r128-6.8.1.tar.bz2
Source56: intel-gpu-tools-1.0.2-20100825-c935c60.tar.bz2
++++++ xf86-video-geode-2.11.9.tar.bz2 -> xf86-video-geode-2.11.10.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/ChangeLog new/xf86-video-geode-2.11.10/ChangeLog
--- old/xf86-video-geode-2.11.9/ChangeLog 2010-08-23 07:11:13.000000000 +0200
+++ new/xf86-video-geode-2.11.10/ChangeLog 2010-11-09 10:22:28.000000000 +0100
@@ -1,3 +1,161 @@
+commit 50f9152e2087fd50dfc09e35505c2fbcdd3183b0
+Author: Martin-Éric Racine
+Date: Tue Nov 9 11:12:44 2010 +0200
+
+ Geode 2.11.10
+
+commit ff091333b506855c17ec8ea5f933026221600be9
+Author: Martin-Éric Racine
+Date: Thu Oct 28 13:13:09 2010 +0300
+
+ Revert "Simplify the mode_valid function"
+
+ This reverts commit fab58e111b6655602b4f739260a01247ff478f35.
+
+commit fab58e111b6655602b4f739260a01247ff478f35
+Author: Huang, FrankR
+Date: Thu Oct 28 15:17:19 2010 +0800
+
+ Simplify the mode_valid function
+
+ Signed-off-by: Frank Huang
+
+commit fb72a210d7de61c49fc66aafa057d8c6a028b907
+Author: Huang, FrankR
+Date: Thu Oct 28 15:16:58 2010 +0800
+
+ Revise the entry for 1024x600
+
+ *Change the entry of 1024x600 from 3 to 7(That will not affect the entries from
+ 3 to 6). And BIOS should set the VG_FP_TYPE bit[5:3] to 7.
+ *Use 1024x600@80 instead of 1024x600@60 parameters to support more 4:3 resolutions
+
+ Signed-off-by: Frank Huang
+
+commit 9caaf7f8294ef9700e9e20e394fee10cc2b1c9c0
+Author: Daniel Drake
+Date: Mon Sep 6 18:35:17 2010 -0600
+
+ Don't power down DCON when it is frozen
+
+ Putting a frozen DCON to sleep (as happens during regular boot of the XO)
+ will cause the frozen image to be corrupted.
+
+ Change the behaviour to only sleep when the DCON is not frozen.
+
+ http://dev.laptop.org/ticket/10196
+
+commit 87512b72d64370e062d209724994a72368c21df6
+Author: Daniel Drake
+Date: Mon Sep 6 18:33:48 2010 -0600
+
+ Add get_crtc output function
+
+ I don't know why X can't do this itself, but when no get_crtc method is
+ provided, X decides that it doesn't know the CRTC of the output and
+ decides to reset the mode completely (causing display powerdown, resulting
+ in an uncomfortable visual interruption to OLPC's boot process).
+
+commit 5e72a00ad26f2052bb48fef041d6fbd14ba18153
+Author: Hunk Cui
+Date: Wed Oct 13 18:26:52 2010 +0800
+
+ Allocate video memory with exaOffscreenAlloc
+
+ *Del for deduct the probable size of a video overlay.
+ *Use exaOffscreenAlloc allocate the video overlay.
+ *Use exaOffscreenAlloc allocate the offscreen surface.
+ *XV-video data has to be allocate in offscreen memory range.
+
+ Signed-off-by: Hunk Cui
+
+commit 334534cde47f1ffe126e4e665988480fc57a7307
+Author: Frank Huang
+Date: Wed Sep 29 16:45:56 2010 +0800
+
+ Add resolution 1024x600 support for PANEL
+
+ *Users can not get 1024x600 by default when using panel without xorg.conf.
+ Add this screen resolution to the panel_modes table to support it by default.
+ *Users who are using VGA will get this resolution by the monitor EDID. No
+ code is needed
+ *Use gtf tool to get the parameters
+ *Ubuntu bugzilla #433142
+
+ Signed-off-by: Frank Huang
+
+commit becaa0ae375e996c2f83192bb84a5c89f94933dd
+Author: Frank Huang
+Date: Wed Sep 29 16:45:42 2010 +0800
+
+ Fix a typo on resolution parameter
+
+ *change from 1028 to 1280
+
+ Signed-off-by: Frank Huang
+
+commit 89c60efe899f0cda4a52e0574f030c021c4b1ece
+Author: Frank Huang
+Date: Wed Sep 29 16:35:46 2010 +0300
+
+ Mode Validation support on modeline in xorg.conf
+
+ *mode validation(lx_output_mode_valid) in this driver should return MODE_OK for
+ all modes filtered out by previous process in this function. Otherwise, new
+ modelines(conf_modes) will be pruned by Xserver function Xf86PruneInvalidModes.
+ The result is that the user can not set arbitrary resolutions. We comply with
+ the code of ATI&&Intel mode_valid function to do this.
+ *For modes that cannot be supported by the geode driver, it is better to give
+ the specific MODE_XXX(such as MODE_CLOCK_RANGE) instead of MODE_BAD.
+
+ Signed-off-by: Frank Huang
+
+commit 74e28b83d5b725a134aad264771a7c9a4d0e38df
+Author: Hunk
+Date: Sun Sep 26 18:14:52 2010 +0800
+
+ Modify rotation pitch & reallocate pixmap for bo
+
+ *Modify rotation pitch value with crtc_mode_set.
+ *Use own wrapper to allocate a pixmap for wrapping a bo.
+ *Ubuntu Bugzilla #377929
+ *Debian Bugzilla #512020
+
+ Signed-off-by: Hunk Cui
+
+commit 7d7cc26011fde18dcce5c6b95cd73a12a71a7f99
+Author: Otavio Salvador
+Date: Thu Sep 23 16:17:40 2010 -0300
+
+ lx_display: fix typo
+
+commit 90dda28842ac76a05ae75a4fdd457dd8b8988950
+Author: Andres Salomon
+Date: Mon Sep 20 11:31:29 2010 -0700
+
+ fix the DCON verification loop for LX output
+
+ This is pretty clearly a bug. This should fix it (after all, that
+ check is merely to see if the panel is a DCON; we don't care at
+ all about the panel bit). This also adds an extra parenthesis in
+ the following if() statement for clarity.
+
+ I'm resisting the temptation to change GeodeRec's Output member to
+ an unsigned long (for now). Bitfields should really be unsigned.
+
+ Signed-off-by: Andres Salomon
+
+commit 5dfe7dbf6ed122fbbb758be7a5b7d78a199583c7
+Author: Frank Huang
+Date: Wed Sep 1 10:30:35 2010 +0800
+
+ Replace xalloc/xrealloc/xfree/xcalloc with malloc/realloc/free/calloc
+
+ * Replace the deprecated functions with new ones
+ Refer to "/xserver/include/os.h"
+
+ Signed-off-by: Frank Huang
+
commit fc342655a3d928759467eac8c917effe8f283031
Author: Martin-Éric Racine
Date: Mon Aug 23 07:46:22 2010 +0300
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/aclocal.m4 new/xf86-video-geode-2.11.10/aclocal.m4
--- old/xf86-video-geode-2.11.9/aclocal.m4 2010-08-23 07:07:14.000000000 +0200
+++ new/xf86-video-geode-2.11.10/aclocal.m4 2010-11-09 10:21:06.000000000 +0100
@@ -8122,7 +8122,7 @@
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT])dnl
+_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
@@ -8133,7 +8133,7 @@
_PKG_TEXT
-To get pkg-config, see http://pkg-config.freedesktop.org/.])dnl
+To get pkg-config, see http://pkg-config.freedesktop.org/.])[]dnl
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -8145,7 +8145,7 @@
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
dnl
-dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
+dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
dnl
dnl Permission is hereby granted, free of charge, to any person obtaining a
dnl copy of this software and associated documentation files (the "Software"),
@@ -8182,7 +8182,7 @@
# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.10.0])
+m4_define([vers_have], [1.11.0])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -8333,6 +8333,7 @@
-e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|\$(prefix)|g' \
+ -e 's|__apploaddir__|\$(appdefaultdir)|g' \
-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
@@ -8490,15 +8491,17 @@
AC_SUBST(MAKE_HTML)
]) # XORG_CHECK_DOCBOOK
-# XORG_WITH_XMLTO([MIN-VERSION])
+# XORG_WITH_XMLTO([MIN-VERSION], [DEFAULT])
# ----------------
# Minimum version: 1.5.0
+# Minimum version for optional DEFAULT argument: 1.11.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-xmlto option, it allows maximum flexibilty in making decisions
-# as whether or not to use the xmlto package.
+# as whether or not to use the xmlto package. When DEFAULT is not specified,
+# --with-xmlto assumes 'auto'.
#
# Interface to module:
# HAVE_XMLTO: used in makefiles to conditionally generate documentation
@@ -8515,10 +8518,12 @@
#
AC_DEFUN([XORG_WITH_XMLTO],[
AC_ARG_VAR([XMLTO], [Path to xmlto command])
+m4_define([_defopt], m4_default([$2], [auto]))
AC_ARG_WITH(xmlto,
AS_HELP_STRING([--with-xmlto],
- [Use xmlto to regenerate documentation (default: yes, if installed)]),
- [use_xmlto=$withval], [use_xmlto=auto])
+ [Use xmlto to regenerate documentation (default: ]_defopt[)]),
+ [use_xmlto=$withval], [use_xmlto=]_defopt)
+m4_undefine([_defopt])
if test "x$use_xmlto" = x"auto"; then
AC_PATH_PROG([XMLTO], [xmlto])
@@ -8572,15 +8577,17 @@
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
]) # XORG_WITH_XMLTO
-# XORG_WITH_ASCIIDOC([MIN-VERSION])
+# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT])
# ----------------
# Minimum version: 1.5.0
+# Minimum version for optional DEFAULT argument: 1.11.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-asciidoc option, it allows maximum flexibilty in making decisions
-# as whether or not to use the asciidoc package.
+# as whether or not to use the asciidoc package. When DEFAULT is not specified,
+# --with-asciidoc assumes 'auto'.
#
# Interface to module:
# HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation
@@ -8593,10 +8600,12 @@
#
AC_DEFUN([XORG_WITH_ASCIIDOC],[
AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command])
+m4_define([_defopt], m4_default([$2], [auto]))
AC_ARG_WITH(asciidoc,
AS_HELP_STRING([--with-asciidoc],
- [Use asciidoc to regenerate documentation (default: yes, if installed)]),
- [use_asciidoc=$withval], [use_asciidoc=auto])
+ [Use asciidoc to regenerate documentation (default: ]_defopt[)]),
+ [use_asciidoc=$withval], [use_asciidoc=]_defopt)
+m4_undefine([_defopt])
if test "x$use_asciidoc" = x"auto"; then
AC_PATH_PROG([ASCIIDOC], [asciidoc])
@@ -8637,15 +8646,17 @@
AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
]) # XORG_WITH_ASCIIDOC
-# XORG_WITH_DOXYGEN([MIN-VERSION])
+# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT])
# --------------------------------
# Minimum version: 1.5.0
+# Minimum version for optional DEFAULT argument: 1.11.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-doxygen option, it allows maximum flexibilty in making decisions
-# as whether or not to use the doxygen package.
+# as whether or not to use the doxygen package. When DEFAULT is not specified,
+# --with-doxygen assumes 'auto'.
#
# Interface to module:
# HAVE_DOXYGEN: used in makefiles to conditionally generate documentation
@@ -8658,10 +8669,12 @@
#
AC_DEFUN([XORG_WITH_DOXYGEN],[
AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
+m4_define([_defopt], m4_default([$2], [auto]))
AC_ARG_WITH(doxygen,
AS_HELP_STRING([--with-doxygen],
- [Use doxygen to regenerate documentation (default: yes, if installed)]),
- [use_doxygen=$withval], [use_doxygen=auto])
+ [Use doxygen to regenerate documentation (default: ]_defopt[)]),
+ [use_doxygen=$withval], [use_doxygen=]_defopt)
+m4_undefine([_defopt])
if test "x$use_doxygen" = x"auto"; then
AC_PATH_PROG([DOXYGEN], [doxygen])
@@ -8702,15 +8715,17 @@
AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
]) # XORG_WITH_DOXYGEN
-# XORG_WITH_GROFF
+# XORG_WITH_GROFF([DEFAULT])
# ----------------
# Minimum version: 1.6.0
+# Minimum version for optional DEFAULT argument: 1.11.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-groff option, it allows maximum flexibilty in making decisions
-# as whether or not to use the groff package.
+# as whether or not to use the groff package. When DEFAULT is not specified,
+# --with-groff assumes 'auto'.
#
# Interface to module:
# HAVE_GROFF: used in makefiles to conditionally generate documentation
@@ -8739,10 +8754,12 @@
#
AC_DEFUN([XORG_WITH_GROFF],[
AC_ARG_VAR([GROFF], [Path to groff command])
+m4_define([_defopt], m4_default([$1], [auto]))
AC_ARG_WITH(groff,
AS_HELP_STRING([--with-groff],
- [Use groff to regenerate documentation (default: yes, if installed)]),
- [use_groff=$withval], [use_groff=auto])
+ [Use groff to regenerate documentation (default: ]_defopt[)]),
+ [use_groff=$withval], [use_groff=]_defopt)
+m4_undefine([_defopt])
if test "x$use_groff" = x"auto"; then
AC_PATH_PROG([GROFF], [groff])
@@ -8805,15 +8822,17 @@
AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes])
]) # XORG_WITH_GROFF
-# XORG_WITH_FOP
+# XORG_WITH_FOP([DEFAULT])
# ----------------
# Minimum version: 1.6.0
+# Minimum version for optional DEFAULT argument: 1.11.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-fop option, it allows maximum flexibilty in making decisions
-# as whether or not to use the fop package.
+# as whether or not to use the fop package. When DEFAULT is not specified,
+# --with-fop assumes 'auto'.
#
# Interface to module:
# HAVE_FOP: used in makefiles to conditionally generate documentation
@@ -8826,10 +8845,12 @@
#
AC_DEFUN([XORG_WITH_FOP],[
AC_ARG_VAR([FOP], [Path to fop command])
+m4_define([_defopt], m4_default([$1], [auto]))
AC_ARG_WITH(fop,
AS_HELP_STRING([--with-fop],
- [Use fop to regenerate documentation (default: yes, if installed)]),
- [use_fop=$withval], [use_fop=auto])
+ [Use fop to regenerate documentation (default: ]_defopt[)]),
+ [use_fop=$withval], [use_fop=]_defopt)
+m4_undefine([_defopt])
if test "x$use_fop" = x"auto"; then
AC_PATH_PROG([FOP], [fop])
@@ -8856,15 +8877,17 @@
AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
]) # XORG_WITH_FOP
-# XORG_WITH_PS2PDF
+# XORG_WITH_PS2PDF([DEFAULT])
# ----------------
# Minimum version: 1.6.0
+# Minimum version for optional DEFAULT argument: 1.11.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-ps2pdf option, it allows maximum flexibilty in making decisions
-# as whether or not to use the ps2pdf package.
+# as whether or not to use the ps2pdf package. When DEFAULT is not specified,
+# --with-ps2pdf assumes 'auto'.
#
# Interface to module:
# HAVE_PS2PDF: used in makefiles to conditionally generate documentation
@@ -8877,10 +8900,12 @@
#
AC_DEFUN([XORG_WITH_PS2PDF],[
AC_ARG_VAR([PS2PDF], [Path to ps2pdf command])
+m4_define([_defopt], m4_default([$1], [auto]))
AC_ARG_WITH(ps2pdf,
AS_HELP_STRING([--with-ps2pdf],
- [Use ps2pdf to regenerate documentation (default: yes, if installed)]),
- [use_ps2pdf=$withval], [use_ps2pdf=auto])
+ [Use ps2pdf to regenerate documentation (default: ]_defopt[)]),
+ [use_ps2pdf=$withval], [use_ps2pdf=]_defopt)
+m4_undefine([_defopt])
if test "x$use_ps2pdf" = x"auto"; then
AC_PATH_PROG([PS2PDF], [ps2pdf])
@@ -8931,14 +8956,12 @@
# parm1: specify the default value, yes or no.
#
AC_DEFUN([XORG_ENABLE_DOCS],[
-default=$1
-if test "x$default" = x ; then
- default="yes"
-fi
+m4_define([default], m4_default([$1], [yes]))
AC_ARG_ENABLE(docs,
AS_HELP_STRING([--enable-docs],
- [Enable building the documentation (default: yes)]),
- [build_docs=$enableval], [build_docs=$default])
+ [Enable building the documentation (default: ]default[)]),
+ [build_docs=$enableval], [build_docs=]default)
+m4_undefine([default])
AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes])
AC_MSG_CHECKING([whether to build documentation])
AC_MSG_RESULT([$build_docs])
@@ -8966,14 +8989,12 @@
# parm1: specify the default value, yes or no.
#
AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[
-devel_default=$1
-if test "x$devel_default" = x ; then
- devel_default="yes"
-fi
+m4_define([devel_default], m4_default([$1], [yes]))
AC_ARG_ENABLE(devel-docs,
AS_HELP_STRING([--enable-devel-docs],
- [Enable building the developer documentation (default: yes)]),
- [build_devel_docs=$enableval], [build_devel_docs=$devel_default])
+ [Enable building the developer documentation (default: ]devel_default[)]),
+ [build_devel_docs=$enableval], [build_devel_docs=]devel_default)
+m4_undefine([devel_default])
AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes])
AC_MSG_CHECKING([whether to build developer documentation])
AC_MSG_RESULT([$build_devel_docs])
@@ -9001,14 +9022,12 @@
# parm1: specify the default value, yes or no.
#
AC_DEFUN([XORG_ENABLE_SPECS],[
-spec_default=$1
-if test "x$spec_default" = x ; then
- spec_default="yes"
-fi
+m4_define([spec_default], m4_default([$1], [yes]))
AC_ARG_ENABLE(specs,
AS_HELP_STRING([--enable-specs],
- [Enable building the specs (default: yes)]),
- [build_specs=$enableval], [build_specs=$spec_default])
+ [Enable building the specs (default: ]spec_default[)]),
+ [build_specs=$enableval], [build_specs=]spec_default)
+m4_undefine([spec_default])
AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes])
AC_MSG_CHECKING([whether to build functional specifications])
AC_MSG_RESULT([$build_specs])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/configure new/xf86-video-geode-2.11.10/configure
--- old/xf86-video-geode-2.11.9/configure 2010-08-23 07:07:29.000000000 +0200
+++ new/xf86-video-geode-2.11.10/configure 2010-11-09 10:21:23.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for xf86-video-geode 2.11.9.
+# Generated by GNU Autoconf 2.67 for xf86-video-geode 2.11.10.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver%2Fgeode.
#
@@ -702,8 +702,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-video-geode'
PACKAGE_TARNAME='xf86-video-geode'
-PACKAGE_VERSION='2.11.9'
-PACKAGE_STRING='xf86-video-geode 2.11.9'
+PACKAGE_VERSION='2.11.10'
+PACKAGE_STRING='xf86-video-geode 2.11.10'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver%2Fgeode'
PACKAGE_URL='http://www.x.org/wiki/GeodeDriver'
@@ -1476,7 +1476,7 @@
# 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-geode 2.11.9 to adapt to many kinds of systems.
+\`configure' configures xf86-video-geode 2.11.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1547,7 +1547,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-geode 2.11.9:";;
+ short | recursive ) echo "Configuration of xf86-video-geode 2.11.10:";;
esac
cat <<\_ACEOF
@@ -1675,7 +1675,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-geode configure 2.11.9
+xf86-video-geode configure 2.11.10
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1999,7 +1999,7 @@
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-geode $as_me 2.11.9, which was
+It was created by xf86-video-geode $as_me 2.11.10, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -4296,6 +4296,7 @@
-e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|\$(prefix)|g' \
+ -e 's|__apploaddir__|\$(appdefaultdir)|g' \
-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
@@ -4726,7 +4727,7 @@
# Define the identity of the package.
PACKAGE='xf86-video-geode'
- VERSION='2.11.9'
+ VERSION='2.11.10'
cat >>confdefs.h <<_ACEOF
@@ -5429,13 +5430,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5432: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5433: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5435: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5436: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5438: output\"" >&5)
+ (eval echo "\"\$as_me:5439: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6640,7 +6641,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6643 "configure"' > conftest.$ac_ext
+ echo '#line 6644 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7868,11 +7869,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7871: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7872: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7875: \$? = $ac_status" >&5
+ echo "$as_me:7876: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8207,11 +8208,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8210: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8211: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8214: \$? = $ac_status" >&5
+ echo "$as_me:8215: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8312,11 +8313,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8315: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8316: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8319: \$? = $ac_status" >&5
+ echo "$as_me:8320: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8367,11 +8368,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8370: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8371: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8374: \$? = $ac_status" >&5
+ echo "$as_me:8375: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10751,7 +10752,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10754 "configure"
+#line 10755 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10847,7 +10848,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10850 "configure"
+#line 10851 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12932,7 +12933,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-geode $as_me 2.11.9, which was
+This file was extended by xf86-video-geode $as_me 2.11.10, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12999,7 +13000,7 @@
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-geode config.status 2.11.9
+xf86-video-geode config.status 2.11.10
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/configure.ac new/xf86-video-geode-2.11.10/configure.ac
--- old/xf86-video-geode-2.11.9/configure.ac 2010-08-23 07:06:51.000000000 +0200
+++ new/xf86-video-geode-2.11.10/configure.ac 2010-11-09 10:20:07.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.59)
AC_INIT([xf86-video-geode],
- [2.11.9],
+ [2.11.10],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver%2Fgeode],
[xf86-video-geode],
[http://www.x.org/wiki/GeodeDriver])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/geode_dcon.c new/xf86-video-geode-2.11.10/src/geode_dcon.c
--- old/xf86-video-geode-2.11.9/src/geode_dcon.c 2010-08-23 07:06:51.000000000 +0200
+++ new/xf86-video-geode-2.11.10/src/geode_dcon.c 2010-11-09 10:20:07.000000000 +0100
@@ -37,6 +37,7 @@
#include
#define DCON_SLEEP_FILE "/sys/devices/platform/dcon/sleep"
+#define DCON_FREEZE_FILE "/sys/devices/platform/dcon/freeze"
static Bool
dcon_present(void)
@@ -53,6 +54,7 @@
DCONDPMSSet(ScrnInfoPtr pScrni, int mode)
{
static int failed = -1;
+ ssize_t ret;
int fd;
char value[1];
@@ -62,6 +64,25 @@
if (failed)
return 0;
+ /* If the DCON is frozen, don't power it down, it was probably frozen
+ * for a reason and powering it down would corrupt the display.
+ * This is needed to avoid losing OLPC's frozen boot image during X
+ * startup, where DPMS is used to power down and up the display.
+ * When geode uses KMS this will not be needed as the system realises
+ * that no mode change is needed and the display power is untouched. */
+ fd = open(DCON_FREEZE_FILE, O_RDONLY);
+ if (fd < 0) {
+ failed = 1;
+ return 0;
+ }
+
+ ret = read(fd, value, 1);
+ close(fd);
+ if (ret == 1) {
+ if (value[0] == '1')
+ return 0;
+ }
+
fd = open(DCON_SLEEP_FILE, O_WRONLY);
if (fd < 0) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/geode_driver.c new/xf86-video-geode-2.11.10/src/geode_driver.c
--- old/xf86-video-geode-2.11.9/src/geode_driver.c 2010-08-23 07:06:51.000000000 +0200
+++ new/xf86-video-geode-2.11.10/src/geode_driver.c 2010-11-09 10:20:07.000000000 +0100
@@ -499,7 +499,7 @@
break;
}
}
- xfree(pEnt);
+ free(pEnt);
if (drvr_setup == NULL)
return FALSE;
@@ -520,9 +520,9 @@
}
if (usedChips)
- xfree(usedChips);
+ free(usedChips);
if (devSections)
- xfree(devSections);
+ free(devSections);
DEBUGMSG(1, (0, X_INFO, "AmdProbe: result (%d)!\n", foundScreen));
return foundScreen;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/gx_driver.c new/xf86-video-geode-2.11.10/src/gx_driver.c
--- old/xf86-video-geode-2.11.9/src/gx_driver.c 2010-08-23 07:06:51.000000000 +0200
+++ new/xf86-video-geode-2.11.10/src/gx_driver.c 2010-11-09 10:20:07.000000000 +0100
@@ -447,7 +447,7 @@
pGeode->useVGA = FALSE;
#if INT10_SUPPORT
- pGeode->vesa = xcalloc(sizeof(VESARec), 1);
+ pGeode->vesa = calloc(sizeof(VESARec), 1);
#endif
}
@@ -960,19 +960,19 @@
XAADestroyInfoRec(pGeode->AccelInfoRec);
if (pGeode->AccelImageWriteBuffers) {
- xfree(pGeode->AccelImageWriteBuffers[0]);
- xfree(pGeode->AccelImageWriteBuffers);
+ free(pGeode->AccelImageWriteBuffers[0]);
+ free(pGeode->AccelImageWriteBuffers);
pGeode->AccelImageWriteBuffers = NULL;
}
if (pGeode->AccelColorExpandBuffers) {
- xfree(pGeode->AccelColorExpandBuffers);
+ free(pGeode->AccelColorExpandBuffers);
pGeode->AccelColorExpandBuffers = NULL;
}
if (pGeode->pExa) {
exaDriverFini(pScrn);
- xfree(pGeode->pExa);
+ free(pGeode->pExa);
pGeode->pExa = NULL;
}
@@ -1259,10 +1259,10 @@
}
} else {
pGeode->AccelImageWriteBuffers =
- xcalloc(sizeof(pGeode->AccelImageWriteBuffers[0]),
+ calloc(sizeof(pGeode->AccelImageWriteBuffers[0]),
pGeode->NoOfImgBuffers);
pGeode->AccelColorExpandBuffers =
- xcalloc(sizeof(pGeode->AccelColorExpandBuffers[0]),
+ calloc(sizeof(pGeode->AccelColorExpandBuffers[0]),
pGeode->NoOfColorExpandLines);
}
}
@@ -1535,7 +1535,7 @@
GeodeFreeRec(ScrnInfoPtr pScrni)
{
if (pScrni->driverPrivate != NULL) {
- xfree(pScrni->driverPrivate);
+ free(pScrni->driverPrivate);
pScrni->driverPrivate = NULL;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/gx_randr.c new/xf86-video-geode-2.11.10/src/gx_randr.c
--- old/xf86-video-geode-2.11.9/src/gx_randr.c 2010-08-23 07:06:51.000000000 +0200
+++ new/xf86-video-geode-2.11.10/src/gx_randr.c 2010-11-09 10:20:07.000000000 +0100
@@ -344,12 +344,12 @@
return FALSE;
#endif
- pRandr = xcalloc(sizeof(XF86RandRInfoRec), 1);
+ pRandr = calloc(sizeof(XF86RandRInfoRec), 1);
if (pRandr == NULL)
return FALSE;
if (!RRScreenInit(pScreen)) {
- xfree(pRandr);
+ free(pRandr);
return FALSE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/gx_video.c new/xf86-video-geode-2.11.10/src/gx_video.c
--- old/xf86-video-geode-2.11.9/src/gx_video.c 2010-08-23 07:06:51.000000000 +0200
+++ new/xf86-video-geode-2.11.10/src/gx_video.c 2010-11-09 10:20:07.000000000 +0100
@@ -182,7 +182,7 @@
adaptors = &newAdaptor;
} else {
newAdaptors = /* need to free this someplace */
- xalloc((num_adaptors +
+ malloc((num_adaptors +
1) * sizeof(XF86VideoAdaptorPtr *));
if (newAdaptors) {
memcpy(newAdaptors, adaptors, num_adaptors *
@@ -198,7 +198,7 @@
xf86XVScreenInit(pScrn, adaptors, num_adaptors);
if (newAdaptors)
- xfree(newAdaptors);
+ free(newAdaptors);
}
}
@@ -374,7 +374,7 @@
XF86VideoAdaptorPtr adapt;
GeodePortPrivRec *pPriv;
- if (!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
+ if (!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
sizeof(GeodePortPrivRec) + sizeof(DevUnion))))
return NULL;
@@ -1403,17 +1403,17 @@
surface->width = w;
surface->height = h;
- if (!(surface->pitches = xalloc(sizeof(int))))
+ if (!(surface->pitches = malloc(sizeof(int))))
return BadAlloc;
- if (!(surface->offsets = xalloc(sizeof(int)))) {
- xfree(surface->pitches);
+ if (!(surface->offsets = malloc(sizeof(int)))) {
+ free(surface->pitches);
return BadAlloc;
}
- if (!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
- xfree(surface->pitches);
- xfree(surface->offsets);
+ if (!(pPriv = malloc(sizeof(OffscreenPrivRec)))) {
+ free(surface->pitches);
+ free(surface->offsets);
return BadAlloc;
}
@@ -1452,9 +1452,9 @@
GXStopSurface(surface);
xf86FreeOffscreenArea(pPriv->area);
- xfree(surface->pitches);
- xfree(surface->offsets);
- xfree(surface->devPrivate.ptr);
+ free(surface->pitches);
+ free(surface->offsets);
+ free(surface->devPrivate.ptr);
return Success;
}
@@ -1542,7 +1542,7 @@
XF86OffscreenImagePtr offscreenImages;
/* need to free this someplace */
- if (!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))))
+ if (!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec))))
return;
offscreenImages[0].image = &Images[0];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/lx_display.c new/xf86-video-geode-2.11.10/src/lx_display.c
--- old/xf86-video-geode-2.11.9/src/lx_display.c 2010-08-23 07:06:51.000000000 +0200
+++ new/xf86-video-geode-2.11.10/src/lx_display.c 2010-11-09 10:20:07.000000000 +0100
@@ -266,6 +266,7 @@
ScrnInfoPtr pScrni = crtc->scrn;
GeodeRec *pGeode = GEODEPTR(pScrni);
DF_VIDEO_SOURCE_PARAMS vs_odd, vs_even;
+ unsigned int rpitch;
df_get_video_source_configuration(&vs_odd, &vs_even);
@@ -279,6 +280,14 @@
/* The output gets turned in in the output code as
* per convention */
+ /* For rotation, any write to the frame buffer region marks
+ * the retire frame as dirty.
+ */
+ if (crtc->rotatedData != NULL) {
+ rpitch = pScrni->displayWidth * (pScrni->bitsPerPixel / 8);
+ vg_set_display_pitch(rpitch);
+ }
+ else
vg_set_display_pitch(pGeode->Pitch);
gp_set_bpp(pScrni->bitsPerPixel);
@@ -363,7 +372,46 @@
WRITE_VID32(DF_DISPLAY_CONFIG, dcfg);
}
- /* Allocates shadow memory, and allocating a new space for Rotatation.
+ /* The Xserver has a scratch pixmap allocation routine that will
+ * try to use the existing scratch pixmap if possible. When the driver
+ * or any other user stop using it, it need to clear out any pixmap
+ * state (private data etc) otherwise the next user may get stale data.
+ */
+
+ /* Use our own wrapper to allocate a pixmap for wrapping a buffer object
+ * It removes using scratch pixmaps for rotate.
+ */
+static PixmapPtr
+lx_create_bo_pixmap(ScreenPtr pScreen,
+ int width, int height,
+ int depth, int bpp,
+ int pitch, pointer pPixData)
+{
+ PixmapPtr pixmap;
+
+ pixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, depth, 0);
+ if (!pixmap)
+ return NULL;
+ if (!(*pScreen->ModifyPixmapHeader)(pixmap, width, height,
+ depth, bpp, pitch, pPixData)) {
+ /* ModifyPixmapHeader failed, so we can't use it as scratch pixmap
+ */
+ (*pScreen->DestroyPixmap)(pixmap);
+ return NULL;
+ }
+
+ return pixmap;
+}
+
+static void
+lx_destory_bo_pixmap(PixmapPtr pixmap)
+{
+ ScreenPtr pScreen = pixmap->drawable.pScreen;
+
+ (*pScreen->DestroyPixmap)(pixmap);
+}
+
+ /* Allocates shadow memory, and allocating a new space for Rotation.
* The size is measured in bytes, and the offset from the beginning
* of card space is returned.
*/
@@ -422,14 +470,15 @@
lx_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
{
ScrnInfoPtr pScrni = crtc->scrn;
- GeodeRec *pGeode = GEODEPTR(pScrni);
PixmapPtr rpixmap;
+ unsigned int rpitch;
+ rpitch = pScrni->displayWidth * (pScrni->bitsPerPixel / 8);
if (!data)
data = lx_crtc_shadow_allocate(crtc, width, height);
- rpixmap = GetScratchPixmapHeader(pScrni->pScreen,
- width, height, pScrni->depth, pScrni->bitsPerPixel, pGeode->Pitch,
+ rpixmap = lx_create_bo_pixmap(pScrni->pScreen,
+ width, height, pScrni->depth, pScrni->bitsPerPixel, rpitch,
data);
if (rpixmap == NULL) {
@@ -447,7 +496,7 @@
GeodeRec *pGeode = GEODEPTR(pScrni);
if (rpixmap)
- FreeScratchPixmapHeader(rpixmap);
+ lx_destory_bo_pixmap(rpixmap);
/* Free shadow memory */
if (data) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/lx_driver.c new/xf86-video-geode-2.11.10/src/lx_driver.c
--- old/xf86-video-geode-2.11.9/src/lx_driver.c 2010-08-23 07:06:51.000000000 +0200
+++ new/xf86-video-geode-2.11.10/src/lx_driver.c 2010-11-09 10:20:07.000000000 +0100
@@ -313,7 +313,7 @@
if (!xf86LoadSubModule(pScrni, "vgahw") || !vgaHWGetHWRec(pScrni))
pGeode->useVGA = FALSE;
- pGeode->vesa = xcalloc(sizeof(VESARec), 1);
+ pGeode->vesa = calloc(sizeof(VESARec), 1);
}
cim_rdmsr = LXReadMSR;
@@ -698,7 +698,7 @@
if (pGeode->pExa) {
exaDriverFini(pScrn);
- xfree(pGeode->pExa);
+ free(pGeode->pExa);
pGeode->pExa = NULL;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/lx_memory.c new/xf86-video-geode-2.11.10/src/lx_memory.c
--- old/xf86-video-geode-2.11.9/src/lx_memory.c 2010-08-23 07:06:51.000000000 +0200
+++ new/xf86-video-geode-2.11.10/src/lx_memory.c 2010-11-09 10:20:07.000000000 +0100
@@ -69,7 +69,7 @@
if (ptr->next)
ptr->next->prev = ptr->prev;
- xfree(ptr);
+ free(ptr);
}
/* Allocate the "rest" of the offscreen memory - this is for
@@ -83,7 +83,7 @@
GeodeMemPtr nptr, ptr = pGeode->offscreenList;
if (!pGeode->offscreenList) {
- pGeode->offscreenList = xcalloc(1, sizeof(*nptr));
+ pGeode->offscreenList = calloc(1, sizeof(*nptr));
pGeode->offscreenList->offset = pGeode->offscreenStart;
pGeode->offscreenList->size = pGeode->offscreenSize;
pGeode->offscreenList->next = NULL;
@@ -95,7 +95,7 @@
/* Go to the end of the list of allocated stuff */
for (; ptr->next; ptr = ptr->next) ;
- nptr = xcalloc(1, sizeof(*nptr));
+ nptr = calloc(1, sizeof(*nptr));
nptr->offset = ptr->offset + ptr->size;
nptr->size = pGeode->offscreenSize -
(nptr->offset - pGeode->offscreenStart);
@@ -125,7 +125,7 @@
offset = ALIGN(pGeode->offscreenStart, align);
- pGeode->offscreenList = xcalloc(1, sizeof(*nptr));
+ pGeode->offscreenList = calloc(1, sizeof(*nptr));
pGeode->offscreenList->offset = offset;
pGeode->offscreenList->size = size;
pGeode->offscreenList->next = NULL;
@@ -149,7 +149,7 @@
offset = ptr->offset + ptr->size;
offset = ALIGN(ptr->offset + ptr->size, align);
- nptr = xcalloc(1, sizeof(*nptr));
+ nptr = calloc(1, sizeof(*nptr));
nptr->offset = offset;
nptr->size = size;
nptr->next = ptr->next;
@@ -247,9 +247,6 @@
/* Get the amount of offscreen memory still left */
size = GeodeOffscreenFreeSize(pGeode);
- /* Deduct the maxmimum size of a video overlay */
- size -= 0x200000;
-
/* Align the size to a K boundary */
size &= ~1023;
@@ -307,7 +304,7 @@
while (ptr) {
nptr = ptr->next;
- xfree(ptr);
+ free(ptr);
ptr = nptr;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/lx_output.c new/xf86-video-geode-2.11.10/src/lx_output.c
--- old/xf86-video-geode-2.11.9/src/lx_output.c 2010-08-23 07:06:51.000000000 +0200
+++ new/xf86-video-geode-2.11.10/src/lx_output.c 2010-11-09 10:20:07.000000000 +0100
@@ -156,13 +156,13 @@
GeodeRec *pGeode = GEODEPTR(pScrni);
/* DCON Panel specific resolution - OLPC's one */
- if (pGeode->Output & (OUTPUT_PANEL | OUTPUT_DCON)) {
+ if (pGeode->Output & OUTPUT_DCON) {
if (pGeode->panelMode->HDisplay == 1200 &&
pGeode->panelMode->VDisplay == 900)
return MODE_OK;
}
- if (pGeode->Output & OUTPUT_PANEL &&
+ if ((pGeode->Output & OUTPUT_PANEL) &&
gfx_is_panel_mode_supported(pGeode->panelMode->HDisplay,
pGeode->panelMode->VDisplay,
pMode->HDisplay,
@@ -182,7 +182,7 @@
if (pMode->type & (M_T_DRIVER | M_T_PREFERRED))
return MODE_OK;
- return MODE_BAD;
+ return MODE_OK;
}
static Bool
@@ -242,11 +242,17 @@
lx_output_destroy(xf86OutputPtr output)
{
if (output->driver_private)
- xfree(output->driver_private);
+ free(output->driver_private);
output->driver_private = NULL;
}
+static xf86CrtcPtr lx_output_get_crtc(xf86OutputPtr output)
+{
+ return output->crtc;
+}
+
+
static const xf86OutputFuncsRec lx_output_funcs = {
.create_resources = lx_create_resources,
.dpms = lx_output_dpms,
@@ -259,6 +265,7 @@
.commit = lx_output_commit,
.detect = lx_output_detect,
.get_modes = lx_output_get_modes,
+ .get_crtc = lx_output_get_crtc,
.set_property = lx_output_set_property,
.destroy = lx_output_destroy,
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/lx_panel.c new/xf86-video-geode-2.11.10/src/lx_panel.c
--- old/xf86-video-geode-2.11.9/src/lx_panel.c 2010-08-23 07:06:51.000000000 +0200
+++ new/xf86-video-geode-2.11.10/src/lx_panel.c 2010-11-09 10:20:07.000000000 +0100
@@ -63,12 +63,15 @@
{MODEPREFIX, 81600, 1152, 1216, 1336, 1520, 0, 864, 865, 868, 895, 0,
V_NHSYNC | V_NVSYNC, MODESUFFIX}
, /* 1152x864@60 */
- {MODEPREFIX, 108000, 1028, 1328, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0,
+ {MODEPREFIX, 108000, 1280, 1328, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0,
V_NHSYNC | V_NVSYNC, MODESUFFIX}
, /* 1280x1024@60 */
{MODEPREFIX, 162000, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0,
V_NHSYNC | V_NVSYNC, MODESUFFIX}
, /* 1600x1200@60 */
+ {MODEPREFIX, 67630, 1024, 1080, 1184, 1344, 0, 600, 601, 604, 629, 0,
+ V_NHSYNC | V_NVSYNC, MODESUFFIX}
+ , /* 1024x600@80 */
};
/* Get the legacy panel size from VSA, and return the associated mode rec */
@@ -84,12 +87,14 @@
reg = LX_READ_VG(0x02);
ret = (reg >> 3) & 0x07;
- /* 7 is a "reserved" value - if we get it, we can only
- * assume that a panel doesn't exist (or it hasn't been
- * configured in the BIOS)
+ /* FIXME: 7 is reserved in default. We use this value to support
+ * wide screen resolution 1024x600@80 now for panel. If you want to use
+ * that resolution, please assign ret to 7 manually here:
+ * "reg = 7"
+ * The user can use this entry for other wide screen resolutions.
*/
- if (ret < 7)
+ if (ret < 8)
return &lx_panel_modes[ret];
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/lx_video.c new/xf86-video-geode-2.11.10/src/lx_video.c
--- old/xf86-video-geode-2.11.9/src/lx_video.c 2010-08-23 07:06:51.000000000 +0200
+++ new/xf86-video-geode-2.11.10/src/lx_video.c 2010-11-09 10:20:07.000000000 +0100
@@ -99,7 +99,7 @@
typedef struct
{
- GeodeMemPtr vidmem;
+ ExaOffscreenArea *vidmem;
RegionRec clip;
CARD32 filter;
CARD32 colorKey;
@@ -188,13 +188,16 @@
/* Copy planar YUV data */
static Bool
-LXAllocMem(GeodeRec *pGeode, GeodePortPrivRec *pPriv, int size)
+LXAllocateVidMem(ScrnInfoPtr pScrni, GeodePortPrivRec *pPriv, int size)
{
if (!pPriv->vidmem || pPriv->vidmem->size < size) {
- if (pPriv->vidmem)
- GeodeFreeOffscreen(pGeode, pPriv->vidmem);
+ if (pPriv->vidmem) {
+ exaOffscreenFree(pScrni->pScreen, pPriv->vidmem);
+ pPriv->vidmem = NULL;
+ }
- pPriv->vidmem = GeodeAllocOffscreen(pGeode, size, 4);
+ pPriv->vidmem = exaOffscreenAlloc(pScrni->pScreen, size, 4,
+ TRUE, NULL, NULL);
if (pPriv->vidmem == NULL) {
ErrorF("Could not allocate memory for the video\n");
@@ -236,8 +239,10 @@
size = YDstPitch * height;
size += UVDstPitch * height;
- if (LXAllocMem(pGeode, pPriv, size) == FALSE)
+ if (LXAllocateVidMem(pScrni, pPriv, size) == FALSE) {
+ ErrorF("Error allocating an offscreen Planar region.\n");
return FALSE;
+ }
/* The top of the source region we want to copy */
top = y1 & ~1;
@@ -297,8 +302,10 @@
lines = ((dstPitch * height) + pGeode->Pitch - 1) / pGeode->Pitch;
- if (LXAllocMem(pGeode, pPriv, lines) == FALSE)
+ if (LXAllocateVidMem(pScrni, pPriv, lines) == FALSE) {
+ ErrorF("Error allocating an offscreen Packed region.\n");
return FALSE;
+ }
/* The top of the source region we want to copy */
top = y1;
@@ -578,7 +585,6 @@
LXStopVideo(ScrnInfoPtr pScrni, pointer data, Bool exit)
{
GeodePortPrivRec *pPriv = (GeodePortPrivRec *) data;
- GeodeRec *pGeode = GEODEPTR(pScrni);
if (pPriv->videoStatus == 0)
return;
@@ -597,7 +603,7 @@
}
if (pPriv->vidmem) {
- GeodeFreeOffscreen(pGeode, pPriv->vidmem);
+ exaOffscreenFree(pScrni->pScreen, pPriv->vidmem);
pPriv->vidmem = NULL;
}
@@ -659,7 +665,7 @@
if (pPriv->freeTime < now) {
if (pPriv->vidmem) {
- GeodeFreeOffscreen(pGeode, pPriv->vidmem);
+ exaOffscreenFree(pScrni->pScreen, pPriv->vidmem);
pPriv->vidmem = NULL;
}
@@ -677,7 +683,7 @@
XF86VideoAdaptorPtr adapt;
GeodePortPrivRec *pPriv;
- adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
+ adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
sizeof(GeodePortPrivRec) + sizeof(DevUnion));
if (adapt == NULL) {
@@ -742,7 +748,7 @@
struct OffscreenPrivRec
{
- GeodeMemPtr vidmem;
+ ExaOffscreenArea *vidmem;
Bool isOn;
};
@@ -800,7 +806,7 @@
{
GeodeRec *pGeode = GEODEPTR(pScrni);
int pitch, lines;
- GeodeMemPtr vidmem;
+ ExaOffscreenArea *vidmem;
struct OffscreenPrivRec *pPriv;
if (w > 1024 || h > 1024)
@@ -812,7 +818,8 @@
pitch = ((w << 1) + 15) & ~15;
lines = ((pitch * h) + (pGeode->Pitch - 1)) / pGeode->Pitch;
- vidmem = GeodeAllocOffscreen(pGeode, lines, 4);
+ vidmem = exaOffscreenAlloc(pScrni->pScreen, lines, 4, TRUE,
+ NULL, NULL);
if (vidmem == NULL) {
ErrorF("Error while allocating an offscreen region.\n");
@@ -822,11 +829,11 @@
surface->width = w;
surface->height = h;
- surface->pitches = xalloc(sizeof(int));
+ surface->pitches = malloc(sizeof(int));
- surface->offsets = xalloc(sizeof(int));
+ surface->offsets = malloc(sizeof(int));
- pPriv = xalloc(sizeof(struct OffscreenPrivRec));
+ pPriv = malloc(sizeof(struct OffscreenPrivRec));
if (pPriv && surface->pitches && surface->offsets) {
@@ -844,13 +851,15 @@
}
if (surface->offsets)
- xfree(surface->offsets);
+ free(surface->offsets);
if (surface->pitches)
- xfree(surface->pitches);
+ free(surface->pitches);
- if (vidmem)
- GeodeFreeOffscreen(pGeode, vidmem);
+ if (vidmem) {
+ exaOffscreenFree(pScrni->pScreen, vidmem);
+ vidmem = NULL;
+ }
return BadAlloc;
}
@@ -871,19 +880,18 @@
struct OffscreenPrivRec *pPriv = (struct OffscreenPrivRec *)
surface->devPrivate.ptr;
ScrnInfoPtr pScrni = surface->pScrn;
- GeodeRec *pGeode = GEODEPTR(pScrni);
if (pPriv->isOn)
LXStopSurface(surface);
if (pPriv->vidmem) {
- GeodeFreeOffscreen(pGeode, pPriv->vidmem);
+ exaOffscreenFree(pScrni->pScreen, pPriv->vidmem);
pPriv->vidmem = NULL;
}
- xfree(surface->pitches);
- xfree(surface->offsets);
- xfree(surface->devPrivate.ptr);
+ free(surface->pitches);
+ free(surface->offsets);
+ free(surface->devPrivate.ptr);
return Success;
}
@@ -908,7 +916,7 @@
XF86OffscreenImagePtr offscreenImages;
/* need to free this someplace */
- if (!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))))
+ if (!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec))))
return;
offscreenImages[0].image = &Images[0];
@@ -957,7 +965,7 @@
adaptors = &newAdaptor;
} else {
newAdaptors =
- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *));
+ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *));
if (newAdaptors) {
memcpy(newAdaptors, adaptors, num_adaptors *
@@ -973,5 +981,5 @@
xf86XVScreenInit(pScrn, adaptors, num_adaptors);
if (newAdaptors)
- xfree(newAdaptors);
+ free(newAdaptors);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/z4l.c new/xf86-video-geode-2.11.10/src/z4l.c
--- old/xf86-video-geode-2.11.9/src/z4l.c 2010-08-23 07:06:51.000000000 +0200
+++ new/xf86-video-geode-2.11.10/src/z4l.c 2010-11-09 10:20:07.000000000 +0100
@@ -960,7 +960,7 @@
{
XF86VideoEncodingPtr enc;
XF86VideoEncodingPtr tencs =
- (XF86VideoEncodingPtr) xrealloc(*encs, sizeof(*tencs) * (*nencs + 1));
+ (XF86VideoEncodingPtr) realloc(*encs, sizeof(*tencs) * (*nencs + 1));
if (tencs == NULL)
return NULL;
@@ -1029,7 +1029,7 @@
l = strlen(&name[0]) + 1;
l = (l + n) & ~n;
n = l + sizeof(*sp);
- cp = (char *)xalloc(n);
+ cp = (char *)malloc(n);
if (cp == NULL)
return 0;
@@ -1055,7 +1055,7 @@
{
XF86ImagePtr img;
XF86ImagePtr timgs =
- (XF86ImagePtr) xrealloc(*imgs, sizeof(*timgs) * (*nimgs + 1));
+ (XF86ImagePtr) realloc(*imgs, sizeof(*timgs) * (*nimgs + 1));
if (timgs == NULL)
return NULL;
@@ -1081,7 +1081,7 @@
{
XF86AttributePtr attr;
XF86AttributePtr tattrs =
- (XF86AttributePtr) xrealloc(*attrs, sizeof(*tattrs) * (*nattrs + 1));
+ (XF86AttributePtr) realloc(*attrs, sizeof(*tattrs) * (*nattrs + 1));
if (tattrs == NULL)
return NULL;
@@ -1127,7 +1127,7 @@
Z4lAddAttribute(XF86AttributePtr attr, char *name,
int min, int max, int flags)
{
- char *cp = (char *)xalloc(strlen((char *)&name[0]) + 1);
+ char *cp = (char *)malloc(strlen((char *)&name[0]) + 1);
if (cp == NULL)
return 0;
@@ -1149,7 +1149,7 @@
Z4lPortPrivRec *pPriv;
XF86VideoAdaptorPtr adpt, *tadpts;
- tadpts = (XF86VideoAdaptorPtr *) xrealloc(*adpts,
+ tadpts = (XF86VideoAdaptorPtr *) realloc(*adpts,
sizeof(*tadpts) * (*nadpts + 1));
if (tadpts == NULL)
@@ -1158,7 +1158,7 @@
*adpts = tadpts;
n = sizeof(*adpt) + sizeof(*pPriv) + 1 * sizeof(*adpt->pPortPrivates);
n += (nattrs - 1) * sizeof(pPriv->attrIds[0]);
- adpt = (XF86VideoAdaptorPtr) xalloc(n);
+ adpt = (XF86VideoAdaptorPtr) malloc(n);
if (adpt == NULL)
return NULL;
@@ -1559,7 +1559,7 @@
has_colorkey = 1;
}
- dp = xalloc(strlen((char *)&capability.card[0]) + 1);
+ dp = malloc(strlen((char *)&capability.card[0]) + 1);
if (dp == NULL)
goto fail;
strcpy(dp, (char *)&capability.card[0]);
@@ -1668,7 +1668,7 @@
}
if ((imgs = adpt->pImages) != NULL)
free(imgs);
- xfree(adpt);
+ free(adpt);
}
}
free(adpts);
++++++ xf86-video-vmware-11.0.2.tar.bz2 -> xf86-video-vmware-11.0.3.tar.bz2 ++++++
++++ 6567 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org