xorg-server: Changes to 'debian-experimental'
ChangeLog | 168 ++++++++++++++++++++++++++++++++
GL/glx/glxcmds.c | 6 +
GL/glx/glxdri.c | 2
GL/glx/glxdri2.c | 26 +---
Xext/xselinux.c | 32 +++++-
aclocal.m4 | 12 +-
configure | 10 +
debian/changelog | 7 -
debian/control | 2
hw/xfree86/common/modeline2c.awk | 3
hw/xfree86/common/xf86AutoConfig.c | 5
hw/xfree86/common/xf86Config.c | 30 +----
hw/xfree86/common/xf86Priv.h | 1
hw/xfree86/dri2/dri2.c | 16 ++-
hw/xfree86/dri2/dri2.h | 5
hw/xfree86/int10/helper_exec.c | 57 +++++++++-
hw/xfree86/modes/xf86Crtc.c | 52 +++++----
hw/xfree86/modes/xf86Modes.c | 28 -----
hw/xfree86/modes/xf86RandR12.c | 21 ----
hw/xfree86/os-support/bsd/i386_video.c | 3
hw/xfree86/os-support/bus/Makefile.am | 12 --
hw/xfree86/os-support/bus/Makefile.in | 25 ----
hw/xfree86/os-support/bus/Pci.h | 3
hw/xfree86/os-support/bus/bsd_pci.c | 2
hw/xfree86/os-support/linux/Makefile.am | 2
hw/xfree86/os-support/linux/Makefile.in | 16 ---
hw/xfree86/os-support/shared/ia64Pci.c | 55 ----------
hw/xfree86/utils/ioport/Makefile.am | 2
hw/xfree86/utils/ioport/Makefile.in | 5
hw/xfree86/xf4bpp/ppcSpMcro.h | 6 -
xkb/xkbUtils.c | 7 -
31 files changed, 374 insertions(+), 247 deletions(-)
New commits:
commit d188d7266b1284b18cb617ce2e65c2d17f437d12
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 21 22:41:01 2008 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 5ec1fcc..19aee9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg-server (2:1.4.99.901-2) UNRELEASED; urgency=low
+xorg-server (2:1.4.99.901-2) experimental; urgency=low
* xserver-xorg-dev needs to depend on libpciaccess-dev.
* Pull from upstream server-1.5-branch as of March 21st (commit 98249dfa).
+ fixes build on ia64 (closes: #471663)
* Add missing conflicts on xserver-xorg-input-2.
- -- Julien Cristau <jcristau@debian.org> Wed, 19 Mar 2008 19:45:55 +0100
+ -- Julien Cristau <jcristau@debian.org> Fri, 21 Mar 2008 22:40:36 +0100
xorg-server (2:1.4.99.901-1) experimental; urgency=low
commit 0169a782b586c44e5793f0ec190ffe54e03cfe71
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 21 22:13:10 2008 +0100
Add missing conflicts on xserver-xorg-input-2.
diff --git a/debian/changelog b/debian/changelog
index b0c4e3b..5ec1fcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-server (2:1.4.99.901-2) UNRELEASED; urgency=low
* xserver-xorg-dev needs to depend on libpciaccess-dev.
* Pull from upstream server-1.5-branch as of March 21st (commit 98249dfa).
+ fixes build on ia64 (closes: #471663)
+ * Add missing conflicts on xserver-xorg-input-2.
-- Julien Cristau <jcristau@debian.org> Wed, 19 Mar 2008 19:45:55 +0100
diff --git a/debian/control b/debian/control
index d59f249..5bf971f 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
xserver-xorg-video, xserver-common, xserver-xorg-video-1.0, xserver-xorg-input,
xserver-xorg-video-1.9, xserver-xorg-input-wacom (<< 0.7.8),
- xserver-xorg-video-2
+ xserver-xorg-video-2, xserver-xorg-input-2
Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
xserver-common
Provides: xserver
commit 0fa46f3d5a30f28847f0df152c472fd95a022dcc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 21 22:12:10 2008 +0100
Update changelogs
diff --git a/ChangeLog b/ChangeLog
index 81a773f..e9de1ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,171 @@
+commit 98249dfa98b53a238b7d881beb5ec8b85f28ecd0
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Thu Mar 20 20:03:02 2008 -0400
+
+ XSELinux: Do a check for whether background "None" is allowed.
+ (cherry picked from commit 3bbd77ff98478153afe3251de9ba11d757218213)
+
+commit d08bb7040cd5ba2d438dec614ff1b4dd0f9b33d5
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Thu Mar 20 19:42:09 2008 -0400
+
+ XSELinux: Correctly handle some permission bits that are used more than once.
+ (cherry picked from commit e323bb426ce8a072d119cb2720b773241259c137)
+
+commit c6ac4d4f4dfe3d792c77c48b009abc6e7103fbad
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Tue Mar 18 17:51:21 2008 -0400
+
+ Apply __glXDisp_GetVisualConfigs message patch
+ From http://bugs.freedesktop.org/show_bug.cgi?id=13863
+
+ Problem was that the glxcmds.c __glXDisp_GetVisualConfigs
+ function left garbage in the tail end of the message used for extensions.
+ (cherry picked from commit edad0a9dfebcce5c54b2f9c32bd9d45549e20c51)
+
+commit 4a61cf3b08942895868e18bff11e0e4e12f69a7e
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Mar 14 14:37:42 2008 -0400
+
+ Fix a stray use of ALLOCATE_LOCAL.
+ (cherry picked from commit 57d48d94b8947c571925e6fd4c9bf041fbd1b2ac)
+
+commit 43739b9a32cbe45139935bbeb39aecf7b7dd017c
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Mar 14 14:24:21 2008 -0400
+
+ RANDR 1.2: Fix initial mode aspect ratio match in a corner case.
+
+ Actually more like in the mainline case, where the ideal mode happens to
+ be the very first aspect match on the first monitor. But let's not
+ split hairs.
+ (cherry picked from commit 824853772241acf64bc37ac8b85254194741ae13)
+
+commit 92cffb8cc2bf0e6ac79a00477d7d63950d584cd3
+Author: Bart Trojanowski <bart@jukie.net>
+Date: Thu Mar 13 17:42:16 2008 -0400
+
+ Bug #14332: Fix PCI access cycles from x86emu.
+
+ The address written to 0xcf8 contains the PCI slot address to send the
+ config cycle to. However, we would ignore that and always send the
+ cycle to the device whose BIOS we were running. This breaks some
+ integrated graphics platforms that have explicit knowledge about the
+ system's host bridge, for example.
+
+commit db26f32d0d0e2d6d11129ddfe46931308e536206
+Author: Doug Chapman <doug.chapman@hp.com>
+Date: Thu Mar 13 17:40:34 2008 -0400
+
+ Bug #14091: Fix build (and runtime) on ia64.
+
+commit 95f6d8822da22518c6e1fb3988f12edd7267d7f8
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Mar 13 17:37:12 2008 -0400
+
+ RANDR 1.2: Fix the RANDR 1.1 screen size estimation to approach reality.
+
+ While the ScreenRec's notion of size in millimeters would get updates,
+ the RANDR 1.1 notion wouldn't, so your screen would appear to be square
+ and probably at some ludicrous DPI.
+
+commit e4dee1626dd97632a6df053f10ef732de341a2f6
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Mar 13 17:34:54 2008 -0400
+
+ RANDR 1.2: Don't report a square resolution to RANDR 1.1 clients.
+
+ It can't possibly do anything useful, and older versions of Gnome (and
+ proably others) get very confused by it. So do the drivers, for that
+ matter.
+
+commit ce70eb1fe333c1a0d4bb259532f547884daa8f26
+Author: Mark Kettenis <mark.kettenis@xs4all.nl>
+Date: Wed Mar 12 21:45:37 2008 +0100
+
+ OpenBSD support for libpciaccess.
+
+ xserver and libpciaccess both need to open /dev/xf86, which can only
+ be opened once. I implemented pci_system_init_dev_mem() like Ian
+ suggested. This requires some minor changes to the BSD-specific
+ os-support code. Since pci_system_init_dev_mem() is a no-op on
+ FreeBSD this should be no problem.
+
+commit b02d11e629cceb8f14e1c8854a2a02411ff071c0
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Mar 11 00:35:31 2008 -0400
+
+ DRI2: Add DRI2AuthConnection().
+
+ DRI2 uses the same authentication scheme as XF86DRI, so implement this
+ entry point so DRI2 protocol code can access it.
+
+commit 54c31572d53ffc1844cba3fa2f748717665381f0
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Feb 6 16:51:57 2008 -0800
+
+ XkbCopyKeymap was mangling doodads and overlays
+
+commit 02feb14a678e3b8ad9acf0b6db8d159b4fd64147
+Author: Kristian Høgsberg <krh@sasori.boston.redhat.com>
+Date: Sun Mar 9 21:40:27 2008 -0400
+
+ GLX: Track changes to DRI_TEX_BUFFER extension.
+
+ We now just pass in the __DRIdrawable.
+ (cherry picked from commit 01c2e01f2aee580438b74bfb9da8f584f3878e6b)
+
+commit 12829f1e9158445dd66d32885ff9e3f902bf8c0e
+Author: Kristian Høgsberg <krh@sasori.boston.redhat.com>
+Date: Sun Mar 9 21:39:19 2008 -0400
+
+ DRI2: Return event buffer head index in DRI2CreateDrawable.
+
+ And pass it to the DRI driver in AIGLX.
+ (cherry picked from commit acedc03367e9e69f03b4838f0f0e8d8a8e872b9b)
+
+commit 4aaf048b5a00ee4f91c2a1d026cd313f0207f0bc
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Mar 7 14:12:28 2008 -0500
+
+ Fix DRI2 texture target for GLX_EXT_texture_from_pixmap.
+
+ Thanks to Dennis Kasprzyk for pointing it out and for reminding me to
+ commit it.
+ (cherry picked from commit 9abaad115cb6245b12b2adb3552ace99b634ab4a)
+
+commit 921cbc58036491eab491b4c7b07111f04aa58d40
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Mar 10 13:40:00 2008 -0400
+
+ Add the "amd" driver to magic driver selection.
+
+commit e5bd75e11f1ac6b01d408166e628e9bbdb218b71
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Mar 10 09:14:20 2008 -0400
+
+ Bug #14927: Fix the math for xf86NumDefaultModes.
+ (cherry picked from commit 0f6aaf636b7ac4c98467284ff7baf1b83e0b72e7)
+
+commit ef702d586697c4ae9092ab0a412719c11973ec60
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Mar 7 09:25:06 2008 -0500
+
+ Size xf86DefaultModes explicitly.
+
+ i.e., don't check for the end of the list by ->name == NULL, since that
+ won't work now. Fix the consumers of xf86DefaultModes to use the new
+ explicit size as well.
+
+commit b260febcec2e483c094d5c31ed9910a36a65cc53
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Mar 7 08:29:49 2008 -0500
+
+ Fix segfault when a monitor exists but has no modes.
+
+ Thanks to Zhenyu Wang for finding this.
+ (cherry picked from commit 3fcb6445dc08f42488287162e3b7009d405e9c5b)
+
commit 375908557fd11e37e8d686f1ff6a372aa2c239de
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 6 00:19:09 2008 -0500
diff --git a/debian/changelog b/debian/changelog
index bd43395..b0c4e3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg-server (2:1.4.99.901-2) UNRELEASED; urgency=low
* xserver-xorg-dev needs to depend on libpciaccess-dev.
+ * Pull from upstream server-1.5-branch as of March 21st (commit 98249dfa).
+ + fixes build on ia64 (closes: #471663)
-- Julien Cristau <jcristau@debian.org> Wed, 19 Mar 2008 19:45:55 +0100
commit 086f2c80069b87e85c7b8baa3ccf833c247c29dc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 21 22:11:26 2008 +0100
autoreconf
diff --git a/aclocal.m4 b/aclocal.m4
index 6e7cdfc..7926191 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6876,7 +6876,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.5
+ [XORG_MACROS_version=1.1.6
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -7025,7 +7025,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+ HAVE_DEFS_ENT=no
+else
+ AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -7297,14 +7301,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package])
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM],
[Minor version of this package])
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
diff --git a/configure b/configure
index ad3acd3..1339412 100755
--- a/configure
+++ b/configure
@@ -27213,7 +27213,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
_ACEOF
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
@@ -27222,7 +27222,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MINOR $PVM
_ACEOF
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
@@ -28771,7 +28771,10 @@ fi
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
-as_ac_File=`echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
+if test x"$cross_compiling" = x"yes" ; then
+ HAVE_DEFS_ENT=no
+else
+ as_ac_File=`echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $XORG_SGML_PATH/X11/defs.ent" >&5
echo $ECHO_N "checking for $XORG_SGML_PATH/X11/defs.ent... $ECHO_C" >&6; }
if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -28794,6 +28797,7 @@ if test `eval echo '${'$as_ac_File'}'` = yes; then
HAVE_DEFS_ENT=yes
fi
+fi
# Extract the first word of "linuxdoc", so it can be a program name with args.
set dummy linuxdoc; ac_word=$2
diff --git a/hw/xfree86/os-support/bus/Makefile.in b/hw/xfree86/os-support/bus/Makefile.in
index 3834213..2071302 100644
--- a/hw/xfree86/os-support/bus/Makefile.in
+++ b/hw/xfree86/os-support/bus/Makefile.in
@@ -61,9 +61,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libbus_la_LIBADD =
am__libbus_la_SOURCES_DIST = Pci.c Pci.h linuxPci.c bsd_pci.c \
- ix86Pci.c ppcPci.c sparcPci.c axpPci.c 460gxPCI.c 460gxPCI.h \
- altixPCI.c altixPCI.h e8870PCI.c e8870PCI.h zx1PCI.c zx1PCI.h \
- Sbus.c
+ ix86Pci.c ppcPci.c sparcPci.c axpPci.c Sbus.c
@XORG_BUS_LINUXPCI_TRUE@am__objects_1 = linuxPci.lo
@XORG_BUS_BSDPCI_TRUE@am__objects_2 = bsd_pci.lo
@XORG_BUS_IX86PCI_TRUE@am__objects_3 = ix86Pci.lo
@@ -72,11 +70,8 @@ am__libbus_la_SOURCES_DIST = Pci.c Pci.h linuxPci.c bsd_pci.c \
@LINUX_ALPHA_TRUE@am__objects_6 = axpPci.lo
am__objects_7 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
$(am__objects_4) $(am__objects_5) $(am__objects_6)
-@LINUX_IA64_TRUE@am__objects_8 = 460gxPCI.lo altixPCI.lo e8870PCI.lo \
-@LINUX_IA64_TRUE@ zx1PCI.lo
-@XORG_BUS_SPARC_TRUE@am__objects_9 = Sbus.lo
-am_libbus_la_OBJECTS = Pci.lo $(am__objects_7) $(am__objects_8) \
- $(am__objects_9)
+@XORG_BUS_SPARC_TRUE@am__objects_8 = Sbus.lo
+am_libbus_la_OBJECTS = Pci.lo $(am__objects_7) $(am__objects_8)
libbus_la_OBJECTS = $(am_libbus_la_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -410,16 +405,6 @@ noinst_LTLIBRARIES = libbus.la
sdk_HEADERS = xf86Pci.h $(am__append_7)
PCI_SOURCES = $(am__append_1) $(am__append_2) $(am__append_3) \
$(am__append_4) $(am__append_5) $(am__append_6)
-@LINUX_IA64_TRUE@PLATFORM_PCI_SOURCES = \
-@LINUX_IA64_TRUE@ 460gxPCI.c \
-@LINUX_IA64_TRUE@ 460gxPCI.h \
-@LINUX_IA64_TRUE@ altixPCI.c \
-@LINUX_IA64_TRUE@ altixPCI.h \
-@LINUX_IA64_TRUE@ e8870PCI.c \
-@LINUX_IA64_TRUE@ e8870PCI.h \
-@LINUX_IA64_TRUE@ zx1PCI.c \
-@LINUX_IA64_TRUE@ zx1PCI.h
-
@XORG_BUS_SPARC_TRUE@PLATFORM_SOURCES = Sbus.c
libbus_la_SOURCES = Pci.c Pci.h $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \
$(PLATFORM_SOURCES)
@@ -478,18 +463,14 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/460gxPCI.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Pci.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sbus.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/altixPCI.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axpPci.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_pci.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e8870PCI.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86Pci.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linuxPci.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppcPci.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sparcPci.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zx1PCI.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff --git a/hw/xfree86/os-support/linux/Makefile.in b/hw/xfree86/os-support/linux/Makefile.in
index 09d83e0..42d0174 100644
--- a/hw/xfree86/os-support/linux/Makefile.in
+++ b/hw/xfree86/os-support/linux/Makefile.in
@@ -60,12 +60,10 @@ am__liblinux_la_SOURCES_DIST = lnx_init.c lnx_video.c lnx_mouse.c \
$(srcdir)/../shared/posix_tty.c $(srcdir)/../shared/vidmem.c \
$(srcdir)/../shared/sigio.c $(srcdir)/../shared/stdResource.c \
lnx_acpi.c lnx_apm.c $(srcdir)/lnx_axp.c \
- $(srcdir)/../shared/xf86Axp.c $(srcdir)/lnx_ia64.c \
- $(srcdir)/../shared/ia64Pci.c
+ $(srcdir)/../shared/xf86Axp.c $(srcdir)/../shared/ia64Pci.c
@LNXACPI_TRUE@am__objects_1 = lnx_acpi.lo lnx_apm.lo
@LNXAPM_TRUE@am__objects_2 = lnx_apm.lo
-@LINUX_ALPHA_FALSE@@LINUX_IA64_TRUE@am__objects_3 = lnx_ia64.lo \
-@LINUX_ALPHA_FALSE@@LINUX_IA64_TRUE@ ia64Pci.lo
+@LINUX_ALPHA_FALSE@@LINUX_IA64_TRUE@am__objects_3 = ia64Pci.lo
@LINUX_ALPHA_TRUE@am__objects_3 = lnx_axp.lo xf86Axp.lo
am_liblinux_la_OBJECTS = lnx_init.lo lnx_video.lo lnx_mouse.lo \
lnx_pci.lo lnx_agp.lo lnx_kmod.lo lnx_bell.lo bios_mmap.lo \
@@ -405,7 +403,7 @@ noinst_LTLIBRARIES = liblinux.la $(am__append_1)
@LINUX_ALPHA_TRUE@ $(srcdir)/lnx_axp.c \
@LINUX_ALPHA_TRUE@ $(srcdir)/../shared/xf86Axp.c
-@LINUX_IA64_TRUE@PLATFORM_PCI_SUPPORT = $(srcdir)/lnx_ia64.c $(srcdir)/../shared/ia64Pci.c
+@LINUX_IA64_TRUE@PLATFORM_PCI_SUPPORT = $(srcdir)/../shared/ia64Pci.c
@LINUX_IA64_TRUE@PLATFORM_DEFINES = -DOS_PROBE_PCI_CHIPSET=lnxProbePciChipset
@LINUX_IA64_TRUE@PLATFORM_INCLUDES = -I$(srcdir)/../shared
@LINUX_ALPHA_TRUE@liblinuxev56_la_CFLAGS = $(AM_CFLAGS) -mcpu=ev56
@@ -501,7 +499,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_apm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_axp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_bell.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_ia64.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_init.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_kmod.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnx_mouse.Plo@am__quote@
@@ -590,13 +587,6 @@ xf86Axp.lo: $(srcdir)/../shared/xf86Axp.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xf86Axp.lo `test -f '$(srcdir)/../shared/xf86Axp.c' || echo '$(srcdir)/'`$(srcdir)/../shared/xf86Axp.c
-lnx_ia64.lo: $(srcdir)/lnx_ia64.c
-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lnx_ia64.lo -MD -MP -MF $(DEPDIR)/lnx_ia64.Tpo -c -o lnx_ia64.lo `test -f '$(srcdir)/lnx_ia64.c' || echo '$(srcdir)/'`$(srcdir)/lnx_ia64.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/lnx_ia64.Tpo $(DEPDIR)/lnx_ia64.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/lnx_ia64.c' object='lnx_ia64.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lnx_ia64.lo `test -f '$(srcdir)/lnx_ia64.c' || echo '$(srcdir)/'`$(srcdir)/lnx_ia64.c
-
ia64Pci.lo: $(srcdir)/../shared/ia64Pci.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ia64Pci.lo -MD -MP -MF $(DEPDIR)/ia64Pci.Tpo -c -o ia64Pci.lo `test -f '$(srcdir)/../shared/ia64Pci.c' || echo '$(srcdir)/'`$(srcdir)/../shared/ia64Pci.c
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ia64Pci.Tpo $(DEPDIR)/ia64Pci.Plo
diff --git a/hw/xfree86/utils/ioport/Makefile.in b/hw/xfree86/utils/ioport/Makefile.in
index cadcd2e..0f9a31d 100644
--- a/hw/xfree86/utils/ioport/Makefile.in
+++ b/hw/xfree86/utils/ioport/Makefile.in
@@ -85,7 +85,8 @@ am_ioport_OBJECTS = ioport-ioport.$(OBJEXT)
ioport_OBJECTS = $(am_ioport_OBJECTS)
am__DEPENDENCIES_1 =
ioport_DEPENDENCIES = ../../os-support/libxorgos.la \
- ../../dummylib/libdummy-nonserver.a $(am__DEPENDENCIES_1)
+ ../../dummylib/libdummy-nonserver.a $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
ioport_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(ioport_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
@@ -414,7 +415,7 @@ ioport_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
ioport_LDADD = \
../../os-support/libxorgos.la \
../../dummylib/libdummy-nonserver.a \
- ${UTILS_SYS_LIBS}
+ ${UTILS_SYS_LIBS} ${PCIACCESS_LIBS}
ioport_SOURCES = \
ioport.c
commit 98249dfa98b53a238b7d881beb5ec8b85f28ecd0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 20 20:03:02 2008 -0400
XSELinux: Do a check for whether background "None" is allowed.
(cherry picked from commit 3bbd77ff98478153afe3251de9ba11d757218213)
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 3035898..17ce7af 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1026,6 +1026,13 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
rc = SELinuxDoCheck(subj, obj, class, access_mode, &auditdata);
if (rc != Success)
rec->status = rc;
+
+ /* Perform the background none check on windows */
+ if (access_mode & DixCreateAccess && rec->rtype == RT_WINDOW) {
+ rc = SELinuxDoCheck(subj, obj, class, DixBlendAccess, &auditdata);
+ if (rc != Success)
+ ((WindowPtr)rec->res)->forcedBG = TRUE;
+ }
}
static void
commit d08bb7040cd5ba2d438dec614ff1b4dd0f9b33d5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 20 19:42:09 2008 -0400
XSELinux: Correctly handle some permission bits that are used more than once.
(cherry picked from commit e323bb426ce8a072d119cb2720b773241259c137)
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 18c6526..3035898 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -152,6 +152,12 @@ static struct security_class_mapping map[] = {
{ NULL }
};
+/* x_resource "read" bits from the list above */
+#define SELinuxReadMask (DixReadAccess|DixGetAttrAccess|DixListPropAccess| \
+ DixGetPropAccess|DixGetFocusAccess|DixListAccess| \
+ DixShowAccess|DixBlendAccess|DixReceiveAccess| \
+ DixUseAccess|DixDebugAccess)
+
/* forward declarations */
static void SELinuxScreen(CallbackListPtr *, pointer, pointer);
@@ -853,6 +859,7 @@ SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata)
SELinuxObjectRec *obj, *data;
Selection *pSel = *rec->ppSel;
Atom name = pSel->selection;
+ Mask access_mode = rec->access_mode;
SELinuxAuditRec auditdata = { .client = rec->client, .selection = name };
security_id_t tsid;
int rc;
@@ -861,11 +868,12 @@ SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata)
obj = dixLookupPrivate(&pSel->devPrivates, objectKey);
/* If this is a new object that needs labeling, do it now */
- if (rec->access_mode & DixCreateAccess) {
+ if (access_mode & DixCreateAccess) {
sidput(obj->sid);
rc = SELinuxSelectionToSID(name, subj, &obj->sid, &obj->poly);
if (rc != Success)
obj->sid = unlabeled_sid;
+ access_mode = DixSetAttrAccess;
}
/* If this is a polyinstantiated object, find the right instance */
else if (obj->poly) {
@@ -890,13 +898,13 @@ SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
/* Perform the security check */
- rc = SELinuxDoCheck(subj, obj, SECCLASS_X_SELECTION, rec->access_mode,
+ rc = SELinuxDoCheck(subj, obj, SECCLASS_X_SELECTION, access_mode,
&auditdata);
if (rc != Success)
rec->status = rc;
/* Label the content (advisory only) */
- if (rec->access_mode & DixSetAttrAccess) {
+ if (access_mode & DixSetAttrAccess) {
data = dixLookupPrivate(&pSel->devPrivates, dataKey);
sidput(data->sid);
if (subj->sel_create_sid)
@@ -976,6 +984,7 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
SELinuxSubjectRec *subj;
SELinuxObjectRec *obj;
SELinuxAuditRec auditdata = { .client = rec->client };
+ Mask access_mode = rec->access_mode;
PrivateRec **privatePtr;
security_class_t class;
int rc, offset;
@@ -997,7 +1006,7 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
/* If this is a new object that needs labeling, do it now */
- if (rec->access_mode & DixCreateAccess && offset >= 0) {
+ if (access_mode & DixCreateAccess && offset >= 0) {
rc = SELinuxLabelResource(rec, subj, obj, class);
if (rc != Success) {
rec->status = rc;
@@ -1005,10 +1014,16 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
}
+ /* Collapse generic resource permissions down to read/write */
+ if (class == SECCLASS_X_RESOURCE) {
+ access_mode = !!(rec->access_mode & SELinuxReadMask); /* rd */
+ access_mode |= !!(rec->access_mode & ~SELinuxReadMask) << 1; /* wr */
+ }
+
/* Perform the security check */
auditdata.restype = rec->rtype;
auditdata.id = rec->id;
- rc = SELinuxDoCheck(subj, obj, class, rec->access_mode, &auditdata);
+ rc = SELinuxDoCheck(subj, obj, class, access_mode, &auditdata);
if (rc != Success)
rec->status = rc;
}
commit c6ac4d4f4dfe3d792c77c48b009abc6e7103fbad
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 18 17:51:21 2008 -0400
Apply __glXDisp_GetVisualConfigs message patch
From http://bugs.freedesktop.org/show_bug.cgi?id=13863
Problem was that the glxcmds.c __glXDisp_GetVisualConfigs
function left garbage in the tail end of the message used for extensions.
(cherry picked from commit edad0a9dfebcce5c54b2f9c32bd9d45549e20c51)
diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index 32d1bc8..3b79cca 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -944,6 +944,12 @@ int __glXDisp_GetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
buf[p++] = modes->transparentAlpha;
buf[p++] = GLX_TRANSPARENT_INDEX_VALUE;
buf[p++] = modes->transparentIndex;
+ buf[p++] = 0;
+ buf[p++] = 0;
+ buf[p++] = 0;
+ buf[p++] = 0;
+ buf[p++] = 0;
+ buf[p++] = 0;
if (client->swapped) {
__GLX_SWAP_INT_ARRAY(buf, __GLX_TOTAL_CONFIG);
commit 4a61cf3b08942895868e18bff11e0e4e12f69a7e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 14 14:37:42 2008 -0400
Fix a stray use of ALLOCATE_LOCAL.
(cherry picked from commit 57d48d94b8947c571925e6fd4c9bf041fbd1b2ac)
diff --git a/hw/xfree86/xf4bpp/ppcSpMcro.h b/hw/xfree86/xf4bpp/ppcSpMcro.h
index 2b7f951..655a883 100644
--- a/hw/xfree86/xf4bpp/ppcSpMcro.h
+++ b/hw/xfree86/xf4bpp/ppcSpMcro.h
@@ -28,11 +28,11 @@
#define SETSPANPTRS(IN,N,IPW,PW,IPPT,PPT,FPW,FPPT,FSORT) \
{ \
N = IN * miFindMaxBand(pGC->pCompositeClip); \
- if(!(PW = (int *)ALLOCATE_LOCAL(N * sizeof(int)))) \
+ if(!(PW = (int *)xalloc(N * sizeof(int)))) \
return; \
- if(!(PPT = (DDXPointRec *)ALLOCATE_LOCAL(N * sizeof(DDXPointRec)))) \
+ if(!(PPT = (DDXPointRec *)xalloc(N * sizeof(DDXPointRec)))) \
{ \
- DEALLOCATE_LOCAL(PW); \
+ free(PW); \
return; \
} \
FPW = PW; \
commit 43739b9a32cbe45139935bbeb39aecf7b7dd017c
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 14 14:24:21 2008 -0400
RANDR 1.2: Fix initial mode aspect ratio match in a corner case.
Actually more like in the mainline case, where the ideal mode happens to
be the very first aspect match on the first monitor. But let's not
split hairs.
(cherry picked from commit 824853772241acf64bc37ac8b85254194741ae13)
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 0bef5b4..2b07421 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1674,14 +1674,19 @@ aspectMatch(float a, float b)
}
static DisplayModePtr
-nextAspectMode(DisplayModePtr start, float aspect)
+nextAspectMode(xf86OutputPtr o, DisplayModePtr last, float aspect)
{
- DisplayModePtr m = start;
+ DisplayModePtr m = NULL;
- if (!m)
+ if (!o)
return NULL;
- for (m = m->next; m; m = m->next)
+ if (!last)
+ m = o->probed_modes;
+ else
+ m = last->next;
+
+ for (; m; m = m->next)
if (aspectMatch(aspect, (float)m->HDisplay / (float)m->VDisplay))
return m;
@@ -1691,31 +1696,29 @@ nextAspectMode(DisplayModePtr start, float aspect)
static DisplayModePtr
bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
{
- int o, p;
- DisplayModePtr mode, test = NULL, match = NULL;
+ int o = -1, p;
+ DisplayModePtr mode = NULL, test = NULL, match = NULL;
- for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
- mode = config->output[o]->probed_modes;
- while ((mode = nextAspectMode(mode, aspect))) {
- for (p = o; nextEnabledOutput(config, enabled, &p); ) {
- test = xf86OutputFindClosestMode(config->output[p], mode);
- if (!test)
- break;
- if (test->HDisplay != mode->HDisplay ||
+ nextEnabledOutput(config, enabled, &o);
+ while ((mode = nextAspectMode(config->output[o], mode, aspect))) {
+ for (p = o; nextEnabledOutput(config, enabled, &p); ) {
+ test = xf86OutputFindClosestMode(config->output[p], mode);
+ if (!test)
+ break;
+ if (test->HDisplay != mode->HDisplay ||
test->VDisplay != mode->VDisplay) {
- test = NULL;
- break;
- }
+ test = NULL;
+ break;
}
+ }
- /* if we didn't match it on all outputs, try the next one */
- if (!test)
- continue;
+ /* if we didn't match it on all outputs, try the next one */
+ if (!test)
+ continue;
- /* if it's bigger than the last one, save it */
- if (!match || (test->HDisplay > match->HDisplay))
- match = test;
- }
+ /* if it's bigger than the last one, save it */
+ if (!match || (test->HDisplay > match->HDisplay))
+ match = test;
}
/* return the biggest one found */
commit 92cffb8cc2bf0e6ac79a00477d7d63950d584cd3
Author: Bart Trojanowski <bart@jukie.net>
Date: Thu Mar 13 17:42:16 2008 -0400
Bug #14332: Fix PCI access cycles from x86emu.
The address written to 0xcf8 contains the PCI slot address to send the
config cycle to. However, we would ignore that and always send the
cycle to the device whose BIOS we were running. This breaks some
integrated graphics platforms that have explicit knowledge about the
system's host bridge, for example.
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index de6fde5..9daff22 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -33,6 +33,7 @@
#ifdef _X86EMU
#include "x86emu/x86emui.h"
#endif
+#include <pciaccess.h>
static int pciCfg1in(CARD16 addr, CARD32 *val);
static int pciCfg1out(CARD16 addr, CARD32 val);
@@ -459,7 +460,43 @@ Mem_wl(CARD32 addr, CARD32 val)
static CARD32 PciCfg1Addr = 0;
-#define OFFSET(Cfg1Addr) (Cfg1Addr & 0xff)
+#define PCI_OFFSET(x) ((x) & 0x000000ff)
+#define PCI_TAG(x) ((x) & 0xffffff00)
+
+static struct pci_device*
+pci_device_for_cfg_address (CARD32 addr)
+{
+ struct pci_device *dev = NULL;
+ PCITAG tag = PCI_TAG(addr);
+ struct pci_slot_match slot_match = {
+ .domain = PCI_DOM_FROM_TAG(tag),
+ .bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag)),
+ .dev = PCI_DEV_FROM_TAG(tag),
+ .func = PCI_FUNC_FROM_TAG(tag),
+ .match_data = 0
+ };
+
+ struct pci_device_iterator *iter =
+ pci_slot_match_iterator_create (&slot_match);
+ if (iter)
+ dev = pci_device_next(iter);
+ if (!dev) {
+ char buf[128]; /* enough to store "%u@%u" */
+ xf86FormatPciBusNumber(tag >> 16, buf);
+ ErrorF("Failed to find device matching %s:%u:%u\n",
+ buf, slot_match.dev, slot_match.func);
+ return NULL;
+ }
+
+ if (pci_device_next(iter)) {
+ char buf[128]; /* enough to store "%u@%u" */
+ xf86FormatPciBusNumber(tag >> 16, buf);
+ ErrorF("Multiple devices matching %s:%u:%u\n",
+ buf, slot_match.dev, slot_match.func);
+ }
+
+ return dev;
+}
static int
pciCfg1in(CARD16 addr, CARD32 *val)
@@ -469,7 +506,8 @@ pciCfg1in(CARD16 addr, CARD32 *val)
return 1;
}
if (addr == 0xCFC) {
- pci_device_cfg_read_u32(Int10Current->dev, val, OFFSET(PciCfg1Addr));
+ pci_device_cfg_read_u32(pci_device_for_cfg_address(PciCfg1Addr),
+ val, PCI_OFFSET(PciCfg1Addr));
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" cfg_inl(%#x) = %8.8x\n", PciCfg1Addr, *val);
return 1;
@@ -487,7 +525,8 @@ pciCfg1out(CARD16 addr, CARD32 val)
if (addr == 0xCFC) {
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" cfg_outl(%#x, %8.8x)\n", PciCfg1Addr, val);
- pci_device_cfg_write_u32(Int10Current->dev, val, OFFSET(PciCfg1Addr));
+ pci_device_cfg_write_u32(pci_device_for_cfg_address(PciCfg1Addr),
+ val, PCI_OFFSET(PciCfg1Addr));
return 1;
}
return 0;
@@ -506,7 +545,8 @@ pciCfg1inw(CARD16 addr, CARD16 *val)
if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
const unsigned offset = addr - 0xCFC;
- pci_device_cfg_read_u16(Int10Current->dev, val, OFFSET(PciCfg1Addr) + offset);
+ pci_device_cfg_read_u16(pci_device_for_cfg_address(PciCfg1Addr),
+ val, PCI_OFFSET(PciCfg1Addr) + offset);
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" cfg_inw(%#x) = %4.4x\n", PciCfg1Addr + offset, *val);
return 1;
@@ -530,7 +570,8 @@ pciCfg1outw(CARD16 addr, CARD16 val)
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" cfg_outw(%#x, %4.4x)\n", PciCfg1Addr + offset, val);
- pci_device_cfg_write_u16(Int10Current->dev, val, OFFSET(PciCfg1Addr) + offset);
+ pci_device_cfg_write_u16(pci_device_for_cfg_address(PciCfg1Addr),
+ val, PCI_OFFSET(PciCfg1Addr) + offset);
return 1;
}
return 0;
@@ -549,7 +590,8 @@ pciCfg1inb(CARD16 addr, CARD8 *val)
if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
const unsigned offset = addr - 0xCFC;
- pci_device_cfg_read_u8(Int10Current->dev, val, OFFSET(PciCfg1Addr) + offset);
+ pci_device_cfg_read_u8(pci_device_for_cfg_address(PciCfg1Addr),
+ val, PCI_OFFSET(PciCfg1Addr) + offset);
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" cfg_inb(%#x) = %2.2x\n", PciCfg1Addr + offset, *val);
return 1;
@@ -573,7 +615,8 @@ pciCfg1outb(CARD16 addr, CARD8 val)
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" cfg_outb(%#x, %2.2x)\n", PciCfg1Addr + offset, val);
- pci_device_cfg_write_u8(Int10Current->dev, val, OFFSET(PciCfg1Addr) + offset);
+ pci_device_cfg_write_u8(pci_device_for_cfg_address(PciCfg1Addr),
+ val, PCI_OFFSET(PciCfg1Addr) + offset);
return 1;
}
return 0;
commit db26f32d0d0e2d6d11129ddfe46931308e536206
Author: Doug Chapman <doug.chapman@hp.com>
Date: Thu Mar 13 17:40:34 2008 -0400
Bug #14091: Fix build (and runtime) on ia64.
diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am
index 381b992..5a15430 100644
--- a/hw/xfree86/os-support/bus/Makefile.am
+++ b/hw/xfree86/os-support/bus/Makefile.am
@@ -27,18 +27,6 @@ if LINUX_ALPHA
PCI_SOURCES += axpPci.c
endif
-if LINUX_IA64
-PLATFORM_PCI_SOURCES = \
- 460gxPCI.c \
- 460gxPCI.h \
- altixPCI.c \
- altixPCI.h \
- e8870PCI.c \
- e8870PCI.h \
- zx1PCI.c \
- zx1PCI.h
-endif
-
if XORG_BUS_SPARC
PLATFORM_SOURCES = Sbus.c
sdk_HEADERS += xf86Sbus.h
diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
index 0abb34f..ebac090 100644
--- a/hw/xfree86/os-support/bus/Pci.h
+++ b/hw/xfree86/os-support/bus/Pci.h
@@ -207,9 +207,8 @@
# endif
#elif defined(__ia64__)
# if defined(linux)
-# define ARCH_PCI_INIT ia64linuxPciInit
+# define ARCH_PCI_INIT linuxPciInit
# endif
-# define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper
#elif defined(__i386__) || defined(__i386)
# if defined(linux)
# define ARCH_PCI_INIT linuxPciInit
diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
index 5a52ffd..beaae3d 100644
--- a/hw/xfree86/os-support/linux/Makefile.am
+++ b/hw/xfree86/os-support/linux/Makefile.am
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = liblinux.la
if LINUX_IA64
-PLATFORM_PCI_SUPPORT = $(srcdir)/lnx_ia64.c $(srcdir)/../shared/ia64Pci.c
+PLATFORM_PCI_SUPPORT = $(srcdir)/../shared/ia64Pci.c
PLATFORM_DEFINES = -DOS_PROBE_PCI_CHIPSET=lnxProbePciChipset
PLATFORM_INCLUDES = -I$(srcdir)/../shared
endif
diff --git a/hw/xfree86/os-support/shared/ia64Pci.c b/hw/xfree86/os-support/shared/ia64Pci.c
index 45522e9..6f6924b 100644
--- a/hw/xfree86/os-support/shared/ia64Pci.c
+++ b/hw/xfree86/os-support/shared/ia64Pci.c
@@ -42,12 +42,7 @@
#include <linux/pci.h>
#include "compiler.h"
-#include "460gxPCI.h"
-#include "e8870PCI.h"
-#include "zx1PCI.h"
-#include "altixPCI.h"
#include "Pci.h"
-#include "ia64Pci.h"
/*
* We use special in/out routines here since Altix platforms require the
@@ -191,53 +186,3 @@ _X_EXPORT unsigned int inl(unsigned long port)
return val;
}
-void
-ia64ScanPCIWrapper(scanpciWrapperOpt flags)
-{
- static IA64Chipset chipset = NONE_CHIPSET;
-
Reply to: