From 320034a15c15b2cdd10637221aa9625ef7b89c26 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 9 Jul 2012 19:44:32 +0200
Subject: [PATCH] new package: add package 'xf86-video-fglrx-legacy'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 config/graphic                                |   6 +
 .../x11/driver/xf86-video-fglrx-legacy/build  | 127 +++
 .../xf86-video-fglrx-legacy/config/amdpcsdb   |  24 +
 .../xf86-video-fglrx-legacy/config/control    | Bin 0 -> 31856 bytes
 .../config/xorg-fglrx-legacy.conf             |  27 +
 .../driver/xf86-video-fglrx-legacy/install    |  38 +
 .../x11/driver/xf86-video-fglrx-legacy/meta   |  36 +
 .../xf86-video-fglrx-legacy/need_unpack       |  31 +
 ...o-fglrx-legacy-12.6-rename_to_legacy.patch |  12 +
 .../xf86-video-fglrx-legacy/source/amdxvba.h  | 831 ++++++++++++++++++
 .../x11/driver/xf86-video-fglrx-legacy/unpack |  37 +
 .../xserver/xorg-server/scripts/xorg_start    |   5 +
 .../xserver/xorg-server/udev.d/97-xorg.rules  |  17 +-
 13 files changed, 1183 insertions(+), 8 deletions(-)
 create mode 100755 packages/x11/driver/xf86-video-fglrx-legacy/build
 create mode 100644 packages/x11/driver/xf86-video-fglrx-legacy/config/amdpcsdb
 create mode 100644 packages/x11/driver/xf86-video-fglrx-legacy/config/control
 create mode 100644 packages/x11/driver/xf86-video-fglrx-legacy/config/xorg-fglrx-legacy.conf
 create mode 100755 packages/x11/driver/xf86-video-fglrx-legacy/install
 create mode 100644 packages/x11/driver/xf86-video-fglrx-legacy/meta
 create mode 100755 packages/x11/driver/xf86-video-fglrx-legacy/need_unpack
 create mode 100644 packages/x11/driver/xf86-video-fglrx-legacy/patches.upstream/xf86-video-fglrx-legacy-12.6-rename_to_legacy.patch
 create mode 100644 packages/x11/driver/xf86-video-fglrx-legacy/source/amdxvba.h
 create mode 100755 packages/x11/driver/xf86-video-fglrx-legacy/unpack

diff --git a/config/graphic b/config/graphic
index df82cbe05d..82ee471d9f 100644
--- a/config/graphic
+++ b/config/graphic
@@ -44,6 +44,12 @@ get_graphicdrivers() {
       XINERAMA_SUPPORT="yes"
     fi
 
+    if [ "$drv" = "fglrx-legacy" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS fglrx-legacy"
+      COMPOSITE_SUPPORT="yes"
+      XINERAMA_SUPPORT="yes"
+    fi
+
     if [ "$drv" = "i915" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i915"
 #      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
diff --git a/packages/x11/driver/xf86-video-fglrx-legacy/build b/packages/x11/driver/xf86-video-fglrx-legacy/build
new file mode 100755
index 0000000000..f9569c976d
--- /dev/null
+++ b/packages/x11/driver/xf86-video-fglrx-legacy/build
@@ -0,0 +1,127 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+if [ "$TARGET_ARCH" = i386 ]; then
+  FGLRX_ARCH=x86
+  LIBDIR=lib
+  BASEDIR=xpic
+elif [ "$TARGET_ARCH" = x86_64 ]; then
+  FGLRX_ARCH=x86_64
+  LIBDIR=lib64
+  BASEDIR=xpic_64a
+fi
+
+INSTALL_DIR=".install/usr/lib/fglrx-legacy/"
+
+cd $PKG_BUILD/common/lib/modules/fglrx/build_mod
+  ln -sf $ROOT/$PKG_BUILD/arch/$FGLRX_ARCH/lib/modules/fglrx/build_mod/libfglrx_ip.a .
+
+  cd 2.6.x
+  sed -i -e 's/  -DPAGE_ATTR_FIX=/-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space -DPAGE_ATTR_FIX=/' Makefile
+  make CC=${CC} KDIR=$(kernel_path)
+
+cd $ROOT/$PKG_BUILD
+
+# config files
+  mkdir -p $INSTALL_DIR/etc/ati
+    cp common/etc/ati/amdpcsdb.default $INSTALL_DIR/etc/ati
+    cp common/etc/ati/control $INSTALL_DIR/etc/ati
+    cp common/etc/ati/signature $INSTALL_DIR/etc/ati
+    ln -sf /storage/.config/fglrx-legacy.conf $INSTALL_DIR/etc/ati/amdpcsdb
+
+    # hack around a broken driver
+    cp $ROOT/$PKG_DIR/config/control $INSTALL_DIR/etc/ati
+
+(
+  cd $INSTALL_DIR/
+  for etc in `find etc -type f`; do
+    mkdir -p $ROOT/$PKG_BUILD/.install/`dirname $etc`
+      ln -sf /var/run/fglrx/$etc $ROOT/$PKG_BUILD/.install/$etc
+  done
+  ln -sf /var/run/fglrx/etc/ati/amdpcsdb $ROOT/$PKG_BUILD/.install/etc/ati/amdpcsdb
+)
+
+# ATI config
+  mkdir -p $INSTALL_DIR/bin
+    cp -P arch/$FGLRX_ARCH/usr/X11R6/bin/aticonfig $INSTALL_DIR/bin
+
+(
+  cd $INSTALL_DIR/
+  for bin in `find bin -type f`; do
+    mkdir -p $ROOT/$PKG_BUILD/.install/usr/`dirname $bin`
+      ln -sf /var/run/fglrx/$bin $ROOT/$PKG_BUILD/.install/usr/$bin
+  done
+)
+
+# OpenGL libs
+  mkdir -p $INSTALL_DIR/lib
+    # rename to not conflicting with Mesa libGL.so
+    cp -P arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/fglrx/fglrx-libGL.so* $INSTALL_DIR/lib/libGL_fglrx.so.1
+
+# System Libs
+  mkdir -p $INSTALL_DIR/lib
+    cp arch/$FGLRX_ARCH/usr/$LIBDIR/libati*.so $INSTALL_DIR/lib
+    cp arch/$FGLRX_ARCH/usr/$LIBDIR/libatiuki.so* $INSTALL_DIR/lib/libatiuki.so.1
+    cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libati*.so* $INSTALL_DIR/lib
+    cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libfglrx*.so* $INSTALL_DIR/lib
+
+# DRI driver
+  mkdir -p $INSTALL_DIR/lib/dri
+    cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/modules/dri/fglrx_dri.so* $INSTALL_DIR/lib/dri
+
+# X.Org modules
+  mkdir -p $INSTALL_DIR/lib/xorg/modules
+    cp -P $BASEDIR/usr/X11R6/$LIBDIR/modules/*.so $INSTALL_DIR/lib/xorg/modules
+
+  mkdir -p $INSTALL_DIR/lib/xorg/modules/drivers
+    cp -P $BASEDIR/usr/X11R6/$LIBDIR/modules/drivers/*_drv.so $INSTALL_DIR/lib/xorg/modules/drivers
+
+  mkdir -p $INSTALL_DIR/lib/xorg/modules/extensions
+    cp -P $BASEDIR/usr/X11R6/$LIBDIR/modules/extensions/fglrx/fglrx-libglx.so $INSTALL_DIR/lib/xorg/modules/extensions/libglx_fglrx.so
+
+  mkdir -p $INSTALL_DIR/lib/xorg/modules/linux
+    cp -P $BASEDIR/usr/X11R6/$LIBDIR/modules/linux/*.so $INSTALL_DIR/lib/xorg/modules/linux
+
+if [ "$XVBA" = yes ]; then
+  cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL_DIR/lib
+  cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.so* $INSTALL_DIR/lib/libAMDXvBA.so.1
+  cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libXvBAW.so* $INSTALL_DIR/lib/libXvBAW.so.1
+
+# install needed files for toolchain
+  mkdir -p $SYSROOT_PREFIX/usr/include/amd
+    cp $ROOT/$PKG_DIR/source/amdxvba.h $SYSROOT_PREFIX/usr/include/amd
+
+  mkdir -p $SYSROOT_PREFIX/usr/lib
+    cp arch/$FGLRX_ARCH/usr/X11R6/*/libXvBAW.so* $SYSROOT_PREFIX/usr/lib
+    ln -sf libXvBAW.so.1.0 $SYSROOT_PREFIX/usr/lib/libXvBAW.so.1
+    ln -sf libXvBAW.so.1 $SYSROOT_PREFIX/usr/lib/libXvBAW.so
+fi
+
+(
+  cd $INSTALL_DIR/
+  for lib in `find lib -type f`; do
+    mkdir -p $ROOT/$PKG_BUILD/.install/usr/`dirname $lib`
+      ln -sf /var/run/fglrx/$lib $ROOT/$PKG_BUILD/.install/usr/$lib
+  done
+)
diff --git a/packages/x11/driver/xf86-video-fglrx-legacy/config/amdpcsdb b/packages/x11/driver/xf86-video-fglrx-legacy/config/amdpcsdb
new file mode 100644
index 0000000000..e7d409d279
--- /dev/null
+++ b/packages/x11/driver/xf86-video-fglrx-legacy/config/amdpcsdb
@@ -0,0 +1,24 @@
+AMDPCSDBV1
+[AMDPCSROOT/SYSTEM/MCIL]
+DigitalHDTVDefaultUnderscan=V0
+UvdEnabled=V1
+HWUVD_H264Level51Support=V1
+
+[AMDPCSROOT/SYSTEM/DDX]
+EnableTearFreeDesktop=V1
+
+DAL2_DATA__2_0\DisplayPath_1\default=R64
+DAL2_DATA__2_0\DisplayPath_1\Adjustment\default=R64
+DAL2_DATA__2_0\DisplayPath_1\Adjustment\All_nodes=R00
+DAL2_DATA__2_0\DisplayPath_1\Adjustment\RangeRgbLimited=R0100000000000000
+DAL2_DATA__2_0\DisplayPath_1\Option\default=R64
+DAL2_DATA__2_0\DisplayPath_1\Option\All_nodes=R42657374566965774F7074696F6E5F48646D6900
+DAL2_DATA__2_0\DisplayPath_1\Option\BestViewOption_Hdmi=R0000000000000000030000000100000008000000
+
+DAL2_DATA__2_0\DisplayPath_2\default=R64
+DAL2_DATA__2_0\DisplayPath_2\Adjustment\default=R64
+DAL2_DATA__2_0\DisplayPath_2\Adjustment\All_nodes=R00
+DAL2_DATA__2_0\DisplayPath_2\Adjustment\RangeRgbLimited=R0100000000000000
+DAL2_DATA__2_0\DisplayPath_2\Option\default=R64
+DAL2_DATA__2_0\DisplayPath_2\Option\All_nodes=R42657374566965774F7074696F6E5F48646D6900
+DAL2_DATA__2_0\DisplayPath_2\Option\BestViewOption_Hdmi=R0000000000000000030000000100000008000000
diff --git a/packages/x11/driver/xf86-video-fglrx-legacy/config/control b/packages/x11/driver/xf86-video-fglrx-legacy/config/control
new file mode 100644
index 0000000000000000000000000000000000000000..394dc1ba2466980738f7ce7e56880da02dafa65a
GIT binary patch
literal 31856
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

literal 0
HcmV?d00001

diff --git a/packages/x11/driver/xf86-video-fglrx-legacy/config/xorg-fglrx-legacy.conf b/packages/x11/driver/xf86-video-fglrx-legacy/config/xorg-fglrx-legacy.conf
new file mode 100644
index 0000000000..1ce2e85a0b
--- /dev/null
+++ b/packages/x11/driver/xf86-video-fglrx-legacy/config/xorg-fglrx-legacy.conf
@@ -0,0 +1,27 @@
+Section "ServerLayout"
+	Identifier     "aticonfig Layout"
+	Screen      0  "screen" 0 0
+EndSection
+
+Section "Device"
+  Identifier  "fglrx"
+  Driver      "fglrx"
+  Option      "HWCursor"              "false"
+EndSection
+
+Section "DRI"
+  Mode 0666
+EndSection
+
+Section "Screen"
+  Identifier   "screen"
+  Device       "fglrx"
+  DefaultDepth 24
+  SubSection   "Display"
+  Depth        24
+  EndSubSection
+EndSection
+
+Section "Extensions"
+  Option      "Composite"             "false"
+EndSection
diff --git a/packages/x11/driver/xf86-video-fglrx-legacy/install b/packages/x11/driver/xf86-video-fglrx-legacy/install
new file mode 100755
index 0000000000..2186f5cadb
--- /dev/null
+++ b/packages/x11/driver/xf86-video-fglrx-legacy/install
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+VER=`ls $BUILD/linux*/modules/lib/modules`
+
+# ATI kernel driver
+mkdir -p $INSTALL/lib/modules/$VER/ati
+  cp $PKG_BUILD/common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $INSTALL/lib/modules/$VER/ati/fglrx_legacy.ko
+
+mkdir -p $INSTALL/etc/X11
+  cp $PKG_DIR/config/*.conf $INSTALL/etc/X11
+
+mkdir -p $INSTALL/usr/config/
+  cp $PKG_DIR/config/amdpcsdb $INSTALL/usr/config/fglrx-legacy.conf
+
+mkdir -p $INSTALL
+  cp -PR $PKG_BUILD/.install/* $INSTALL
diff --git a/packages/x11/driver/xf86-video-fglrx-legacy/meta b/packages/x11/driver/xf86-video-fglrx-legacy/meta
new file mode 100644
index 0000000000..0ab7f8b391
--- /dev/null
+++ b/packages/x11/driver/xf86-video-fglrx-legacy/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="xf86-video-fglrx-legacy"
+PKG_VERSION="12.6"
+PKG_REV="1"
+PKG_ARCH="i386 x86_64"
+PKG_LICENSE="nonfree"
+PKG_SITE="http://www.ati.com/"
+PKG_URL="$DISTRO_SRC/amd-driver-installer-$PKG_VERSION-legacy-x86.x86_64.run"
+PKG_DEPENDS="linux libX11 libXinerama libXcomposite"
+PKG_BUILD_DEPENDS="toolchain util-macros libX11 libXinerama libXcomposite linux"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/driver"
+PKG_SHORTDESC="xf86-video-fglrx-legacy: ATI binary Xorg driver for HD2xxx-HD4xxx"
+PKG_LONGDESC="These binary drivers provide optimized hardware acceleration of OpenGL applications via a direct-rendering X Server. AGP, PCIe, SLI, TV-out and flat panel displays are also supported."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
diff --git a/packages/x11/driver/xf86-video-fglrx-legacy/need_unpack b/packages/x11/driver/xf86-video-fglrx-legacy/need_unpack
new file mode 100755
index 0000000000..c8f7212925
--- /dev/null
+++ b/packages/x11/driver/xf86-video-fglrx-legacy/need_unpack
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+STAMP=$STAMPS/$1/unpack
+
+test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
+     $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
+     $PKG_DIR/url -nt $STAMP && rm -f $STAMP
+
+exit 0
diff --git a/packages/x11/driver/xf86-video-fglrx-legacy/patches.upstream/xf86-video-fglrx-legacy-12.6-rename_to_legacy.patch b/packages/x11/driver/xf86-video-fglrx-legacy/patches.upstream/xf86-video-fglrx-legacy-12.6-rename_to_legacy.patch
new file mode 100644
index 0000000000..18d88e2a6d
--- /dev/null
+++ b/packages/x11/driver/xf86-video-fglrx-legacy/patches.upstream/xf86-video-fglrx-legacy-12.6-rename_to_legacy.patch
@@ -0,0 +1,12 @@
+diff -Naur xf86-video-fglrx-legacy-12.6/common/lib/modules/fglrx/build_mod/firegl_public.c xf86-video-fglrx-legacy-12.6.patch/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- xf86-video-fglrx-legacy-12.6/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-07-04 21:43:47.000000000 +0200
++++ xf86-video-fglrx-legacy-12.6.patch/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-07-09 19:33:02.694483911 +0200
+@@ -940,7 +940,7 @@
+ 
+ static struct pci_driver fglrx_pci_driver = 
+ {
+-    .name           = "fglrx_pci",
++    .name           = "fglrx_legacy_pci",
+     .id_table       = fglrx_pci_table,
+     .probe          = fglrx_pci_probe,
+ #ifdef CONFIG_PM
diff --git a/packages/x11/driver/xf86-video-fglrx-legacy/source/amdxvba.h b/packages/x11/driver/xf86-video-fglrx-legacy/source/amdxvba.h
new file mode 100644
index 0000000000..472fa2ae70
--- /dev/null
+++ b/packages/x11/driver/xf86-video-fglrx-legacy/source/amdxvba.h
@@ -0,0 +1,831 @@
+/*******************************************************************************
+*
+* Copyright (c) 2011, Advanced Micro Devices, Inc.
+* All rights reserved.
+* 
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following are met:
+* 
+* Neither the name of the copyright holder nor the names of its
+* contributors may be used to endorse or promote products derived from
+* this software without specific, prior, written permission.
+* 
+* You must reproduce the above copyright notice.
+* 
+* You must include the following terms in your license and/or other
+* materials provided with the software.
+* 
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+* HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+* Without limiting the foregoing, the software may implement third
+* party technologies (e.g. third party libraries) for which you must
+* obtain licenses from parties other than AMD.  You agree that AMD has
+* not obtained or conveyed to you, and that you shall be responsible for
+* obtaining the rights to use and/or distribute the applicable underlying
+* intellectual property rights related to the third party technologies.
+* These third party technologies are not licensed hereunder.
+* 
+* Without limiting the foregoing, for MPEG-2 products, the following
+* additional notices are provided: For MPEG-2 Encoding Products (those
+* that are "Sold" to end-users, directly or indirectly):
+* 
+*     NO LICENSE IS GRANTED HEREIN, BY IMPLICATION OR OTHERWISE,
+*     TO YOU OR YOUR CUSTOMERS TO USE MPEG-2 ENCODING PRODUCTS,
+*     MPEG-2 DISTRIBUTION ENCODING PRODUCTS, MPEG-2 ENCODING SOFTWARE,
+*     AND/OR MPEG-2 BUNDLED ENCODING SOFTWARE FOR ENCODING OR HAVING
+*     ENCODED ONE OR MORE MPEG-2 VIDEO EVENTS FOR RECORDING ON AN
+*     MPEG-2 PACKAGED MEDIUM FOR ANY USE OR DISTRIBUTION OTHER THAN
+*     PERSONAL USE OF LICENSEE'S CUSTOMER.
+* 
+* For MPEG-2 Intermediate Products (those that are NOT "Sold" to
+* end-users, directly or indirectly):
+* 
+*     NO LICENSE IS GRANTED HEREIN, BY IMPLICATION OR OTHERWISE,
+*     TO YOU OR YOUR CUSTOMERS TO USE MPEG-2 INTERMEDIATE PRODUCTS
+*     MANUFACTURED OR SOLD BY YOU.
+* 
+* If you use the software (in whole or in part), you shall adhere to
+* all applicable U.S., European, and other export laws, including but
+* not limited to the U.S. Export Administration Regulations ("EAR"),
+* (15 C.F.R. Sections 730 through 774), and E.U. Council Regulation (EC)
+* No 1334/2000 of 22 June 2000.  Further, pursuant to Section 740.6 of
+* the EAR, you hereby certify that, except pursuant to a license granted
+* by the United States Department of Commerce Bureau of Industry and
+* Security or as otherwise permitted pursuant to a License Exception
+* under the U.S. Export Administration Regulations ("EAR"), you will
+* not (1) export, re-export or release to a national of a country in
+* Country Groups D:1, E:1 or E:2 any restricted technology, software,
+* or source code you receive hereunder, or (2) export to Country Groups
+* D:1, E:1 or E:2 the direct product of such technology or software, if
+* such foreign produced direct product is subject to national security
+* controls as identified on the Commerce Control List (currently found
+* in Supplement 1 to Part 774 of EAR).  For the most current Country
+* Group listings, or for additional information about the EAR or your
+* obligations under those regulations, please refer to the U.S. Bureau
+* of Industry and Security's website at http://www.bis.doc.gov/.
+*
+*******************************************************************************/
+
+#ifndef _XVBA_H
+#define _XVBA_H
+
+// A minor revision change indicates a backward-compatible change; a major revision change indicates a backward-incompatible
+#define XVBA_VERSION_MAJOR         0
+#define XVBA_VERSION_MINOR         74
+#define XVBA_VERSION ((XVBA_VERSION_MAJOR << 16) | XVBA_VERSION_MINOR)
+
+#define NUM_OF_XVBA_DECODE_CAP              3
+#define NUM_OF_XVBA_GET_SURFACE_TARGET      3
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum _XVBA_SURFACE_FLAG
+{
+    XVBA_FRAME = 0,
+    XVBA_TOP_FIELD,
+    XVBA_BOTTOM_FIELD,
+
+} XVBA_SURFACE_FLAG;
+
+/*  Four-character-code (FOURCC) */
+#define XVBA_FOURCC(a,b,c,d)\
+    (((unsigned int)(a)<<0) |\
+    ((unsigned int)(b)<<8) |\
+    ((unsigned int)(c)<<16)|\
+    ((unsigned int)(d)<<24))
+
+typedef enum _XVBA_SURFACE_FORMAT
+{
+    XVBA_NV12       = XVBA_FOURCC('N','V','1','2'), /* 12bit  Y/CbCr 4:2:0 planar  */
+    XVBA_YUY2       = XVBA_FOURCC('Y','U','Y','2'), /* 16bit  YUV 4:2:2 */
+    XVBA_ARGB       = XVBA_FOURCC('A','R','G','B'), /* 32bit  ARGB-8-8-8-8  */
+    XVBA_AYUV       = XVBA_FOURCC('A','Y','U','V'), /* 32bit  AYUV-8-8-8-8  */
+    XVBA_YV12       = XVBA_FOURCC('Y','V','1','2'), /* 12bit  Y/V/U 4:2:0 planar  */
+} XVBA_SURFACE_FORMAT;
+
+typedef struct _XVBA_GetSurface_Target
+{
+    unsigned int    size;       ///< structure size
+    XVBA_SURFACE_FORMAT surfaceType;
+    XVBA_SURFACE_FLAG   flag;
+} XVBA_GetSurface_Target;
+
+/**
+ *  XVBA Query Extension
+ */
+Bool
+XVBAQueryExtension
+(
+    Display     *display,
+    int         *version
+);
+
+/******************************************************************/
+/*    XVBA Context                                                */
+/******************************************************************/
+
+/**
+ *  XVBA Context Create
+ */
+typedef struct
+{
+    unsigned int    size;       ///< structure size
+    Display         *display;
+    Drawable        draw;
+
+} XVBA_Create_Context_Input;
+
+typedef struct
+{
+    unsigned int    size;       ///< structure size
+    void            *context;
+
+} XVBA_Create_Context_Output;
+
+Status
+XVBACreateContext
+(
+    XVBA_Create_Context_Input   *create_context_input,
+    XVBA_Create_Context_Output  *create_context_output
+);
+
+/**
+ *  XVBA Context Destroy
+ */
+Status
+XVBADestroyContext
+(
+    void    *context
+);
+
+
+/******************************************************************/
+/*    XVBA Sessions                                                */
+/******************************************************************/
+
+/**
+ *  XVBA Context Query Session Info
+ */
+typedef struct
+{
+    unsigned int    size;       ///< structure size
+    void            *context;
+
+} XVBA_GetSessionInfo_Input;
+
+typedef struct
+{
+    unsigned int    size;                       ///< structure size
+    unsigned int    getcapdecode_output_size;   ///< 0 = Decode not supported, NZ = Decode session is supported and the value is used for XVBAGetCapDecode output struct size
+    unsigned int    xvba_gsio_reserved_0;
+    unsigned int    xvba_gsio_reserved_1;
+} XVBA_GetSessionInfo_Output;
+
+Status
+XVBAGetSessionInfo
+(
+    XVBA_GetSessionInfo_Input   *get_session_info_input,
+    XVBA_GetSessionInfo_Output  *get_session_info_output
+);
+
+/******************************************************************/
+/*   XVBA decode errors                                           */
+/******************************************************************/
+
+typedef enum
+{
+    XVBA_DECODE_NO_ERROR = 0,
+    XVBA_DECODE_BAD_PICTURE,    ///< the entire picture is corrupted . All MBs are invalid
+    XVBA_DECODE_BAD_SLICE,      ///< part of the picture, slice, wasn.t decoded properly . all MBs in this slice are bad
+    XVBA_DECODE_BAD_MB          ///< some MBs are not decoded properly
+
+} XVBA_DECODE_ERROR;
+
+typedef struct
+{
+    unsigned int        size;           ///< structure size
+    XVBA_DECODE_ERROR   type;
+    unsigned int        num_of_bad_mbs; ///< number of marcoblocks that were not properly decoded
+
+} XVBADecodeError;
+
+/******************************************************************/
+/*    XVBA Surface                                               */
+/******************************************************************/
+
+/**
+ *  XVBA Surface create
+ */
+typedef struct
+{
+    unsigned int        size;
+    void                *session;
+    unsigned int        width;
+    unsigned int        height;
+    XVBA_SURFACE_FORMAT surface_type;
+
+} XVBA_Create_Surface_Input;
+
+typedef struct
+{
+    unsigned int    size;
+    void            *surface;   ///< Pointer to XVBASurface
+
+} XVBA_Create_Surface_Output;
+
+Status
+XVBACreateSurface(
+    XVBA_Create_Surface_Input   *create_surface_input,
+    XVBA_Create_Surface_Output  *create_surface_output
+);
+
+/**
+ *  XVBA Surface destroy
+ */
+Status
+XVBADestroySurface(
+    void        *surface
+);
+
+
+/**
+ *  Synchronization query_status_flags
+ */
+typedef enum
+{
+    XVBA_GET_SURFACE_STATUS = 1,    ///< get surface status; is surface still used by GPU
+    XVBA_GET_DECODE_ERRORS          ///< get decode errors for target surface
+
+} XVBA_QUERY_STATUS;
+
+/**
+ *  Synchronization status flags
+ */
+#define XVBA_STILL_PENDING      0x00000001 ///< surface is still used by HW
+#define XVBA_COMPLETED          0x00000002 ///< HW completed job on this surface
+#define XVBA_NO_ERROR_DECODE    0x00000004 ///< no decode errors
+#define XVBA_ERROR_DECODE       0x00000008 ///< decode errors for queried surface
+
+
+/**
+ *  XVBA Surface synchronization
+ */
+typedef struct
+{
+   unsigned int         size;
+   void                 *session;
+   void                 *surface;
+   XVBA_QUERY_STATUS    query_status;
+
+} XVBA_Surface_Sync_Input;
+
+typedef struct
+{
+   unsigned int         size;
+   unsigned int         status_flags;
+   XVBADecodeError      decode_error;
+
+} XVBA_Surface_Sync_Output;
+
+Status
+XVBASyncSurface (
+    XVBA_Surface_Sync_Input     *surface_sync_input,
+    XVBA_Surface_Sync_Output    *surface_sync_output
+);
+
+
+// Conversion from OGL to XVBA surface
+
+typedef struct
+{
+    unsigned int 	size;
+    void            *session;
+    void            *glcontext;
+    unsigned int    gltexture;
+
+} XVBA_Create_GLShared_Surface_Input;
+
+typedef struct
+{
+    unsigned int    size;
+    void            *surface;	// Pointer to XVBASurface
+
+} XVBA_Create_GLShared_Surface_Output;
+
+Status
+XVBACreateGLSharedSurface (
+    XVBA_Create_GLShared_Surface_Input  *create_glshared_surface_input,
+    XVBA_Create_GLShared_Surface_Output *create_glshared_surface_output
+);
+
+
+/**
+ *  XVBA Get Surface
+ */
+typedef struct {
+    unsigned int    size;           ///< structure size
+    void            *session;       // XVBA session
+    void            *src_surface;   // source XVBA surface
+    void            *target_buffer;    // application supplied system memory buffer
+    unsigned int    target_pitch;      // pitch of the destination buffer
+    unsigned int    target_width;      // width of the destination buffer
+    unsigned int    target_height;     // height of the destination buffer
+    XVBA_GetSurface_Target target_parameter; // destination buffer format and flag
+    unsigned int    reserved [4];   // reserved
+} XVBA_Get_Surface_Input;
+
+Status
+XVBAGetSurface (
+    XVBA_Get_Surface_Input   *get_surface_input
+);
+
+/**
+ *  XVBA Transfer Surface
+ */
+typedef struct {
+    unsigned int    size;           ///< structure size
+    void            *session;       // XVBA session
+    void            *src_surface;   // source XVBA surface
+    void            *target_surface;   // destination XVBA surface
+    XVBA_SURFACE_FLAG    flag;      // top, bottom or frame
+    unsigned int    reserved [4];   // reserved
+} XVBA_Transfer_Surface_Input;
+
+Status
+XVBATransferSurface (
+    XVBA_Transfer_Surface_Input   *transfer_surface_input
+);
+
+/******************************************************************/
+/*    XVBA Buffers                                                */
+/******************************************************************/
+
+typedef enum
+{
+    XVBA_NONE = 0,
+    XVBA_PICTURE_DESCRIPTION_BUFFER,
+    XVBA_DATA_BUFFER,
+    XVBA_DATA_CTRL_BUFFER,
+    XVBA_QM_BUFFER
+
+} XVBA_BUFFER;
+
+typedef struct
+{
+    unsigned int    size;               ///< structure size
+    XVBA_BUFFER     buffer_type;
+    unsigned int    buffer_size;        ///< allocated size of data in bytes
+    void            *bufferXVBA;        ///< pointer to XVBA decode data buffer
+    unsigned int    data_size_in_buffer;///< Used in Decode call only
+    int             data_offset;        ///< Used in Decode call only
+    void            *appPrivate;        ///< used only by application to store pointer to its private data.
+
+} XVBABufferDescriptor;
+
+/**
+ *  XVBA Decode buffers create
+ */
+typedef struct
+{
+    unsigned int    size;               ///< structure size
+    void            *session;
+    XVBA_BUFFER     buffer_type;
+    unsigned int    num_of_buffers;
+
+} XVBA_Create_DecodeBuff_Input;
+
+typedef struct
+{
+    unsigned int            size;       ///< structure size
+    unsigned int            num_of_buffers_in_list;
+    XVBABufferDescriptor    *buffer_list;
+
+} XVBA_Create_DecodeBuff_Output;
+
+Status
+XVBACreateDecodeBuffers (
+    XVBA_Create_DecodeBuff_Input    *create_decodebuff_input,
+    XVBA_Create_DecodeBuff_Output   *create_decodebuff_output
+);
+
+/**
+ *  XVBA Decode buffers destroy
+ */
+typedef struct
+{
+    unsigned int            size;
+    void                    *session;
+    unsigned int            num_of_buffers_in_list;
+    XVBABufferDescriptor    *buffer_list;
+
+} XVBA_Destroy_Decode_Buffers_Input;
+
+Status
+XVBADestroyDecodeBuffers (
+    XVBA_Destroy_Decode_Buffers_Input *buffer_list
+);
+
+
+/******************************************************************/
+/*   XVBA Decode session (XVBADecodeCap)                          */
+/******************************************************************/
+
+/**
+ *  XVBADecodeCap flags
+ */
+typedef enum
+{
+    XVBA_NOFLAG = 0,
+    XVBA_H264_BASELINE,
+    XVBA_H264_MAIN,
+    XVBA_H264_HIGH,
+
+    XVBA_VC1_SIMPLE,
+    XVBA_VC1_MAIN,
+    XVBA_VC1_ADVANCED,
+
+} XVBA_DECODE_FLAGS;
+
+/**
+ *  XVBADecodeCap capability_id
+ */
+typedef enum
+{
+    XVBA_H264    = 0x100,///< bitstream level of acceleration
+    XVBA_VC1,            ///< bitstream level of acceleration
+    XVBA_MPEG2_IDCT,     ///< iDCT and motion compensation level of acceleration
+    XVBA_MPEG2_VLD       ///< bitstream level of acceleration
+
+} XVBA_CAPABILITY_ID;
+
+typedef struct {
+    unsigned int        size;           ///< structure size
+    XVBA_CAPABILITY_ID  capability_id;  ///< Unique descriptor for decode capability
+    XVBA_DECODE_FLAGS   flags;          ///< defines for additional information about capability
+    XVBA_SURFACE_FORMAT surface_type;   ///< Surface type: fourcc YUV or RGB supported with this capability.
+    
+} XVBADecodeCap;
+
+/**
+ *  XVBADecodeCap Query Info
+ */
+typedef struct {
+    unsigned int    size;       ///< structure size
+    void            *context;
+
+} XVBA_GetCapDecode_Input;
+
+typedef struct {
+    unsigned int    size;       ///< structure size
+    unsigned int    num_of_decodecaps;
+    XVBADecodeCap   decode_caps_list[NUM_OF_XVBA_DECODE_CAP];
+    unsigned int    num_of_getsurface_target;
+    XVBA_GetSurface_Target getsurface_target_list[NUM_OF_XVBA_GET_SURFACE_TARGET];
+} XVBA_GetCapDecode_Output;
+
+Status
+XVBAGetCapDecode (
+    XVBA_GetCapDecode_Input     *decodecap_list_input,
+    XVBA_GetCapDecode_Output    *decodecap_list_output
+);
+
+/**
+ *  XVBADecodeCap create
+ */
+typedef struct {
+   unsigned int         size;           ///< structure size
+   unsigned int         width;          ///< decoded video width
+   unsigned int         height;         ///< decoded video height
+   void                 *context;
+   XVBADecodeCap        *decode_cap;    ///< capability from the driver reported list
+
+} XVBA_Create_Decode_Session_Input;
+
+typedef struct {
+    unsigned int    size;              ///< structure size
+    void            *session;          ///< Pointer to the created decode session
+
+} XVBA_Create_Decode_Session_Output;
+
+Status
+XVBACreateDecode (
+    XVBA_Create_Decode_Session_Input    *create_decode_session_input,
+    XVBA_Create_Decode_Session_Output   *create_decode_session_output
+);
+
+/**
+ *  XVBADecodeCap destroy
+ */
+Status
+XVBADestroyDecode (
+    void *session
+);
+
+
+/******************************************************************/
+/*   XVBA Decode API                                              */
+/******************************************************************/
+#define XVBA_PREDICTION_FIELD       0x01
+#define XVBA_PREDICTION_FRAME       0x02
+#define XVBA_PREDICTION_DUAL_PRIME  0x03
+#define XVBA_PREDICTION_16x8        0x02
+
+#define XVBA_SECOND_FIELD       0x00000004
+
+
+/**
+ *  XVBA inits picture decoding
+ */
+typedef struct
+{
+    unsigned int    size;               ///< structure size
+    void            *session;           ///< pointer to decode session
+    void            *target_surface;    ///< decode target
+
+} XVBA_Decode_Picture_Start_Input;
+
+Status
+XVBAStartDecodePicture (
+    XVBA_Decode_Picture_Start_Input  *decode_picture_start
+);
+
+/**
+ *  XVBA picture decode
+ */
+typedef struct
+{
+    unsigned int            size;                   ///< structure size
+    void                    *session;               ///< pointer to decode session
+    unsigned int            num_of_buffers_in_list; ///< number of decode compressed data buffers
+    XVBABufferDescriptor    **buffer_list;          ///< array of XVBABufferDescriptor structures
+
+} XVBA_Decode_Picture_Input;
+
+Status
+XVBADecodePicture (
+    XVBA_Decode_Picture_Input *decode_picture_input
+);
+
+/**
+ *  XVBA end picture decode
+ */
+typedef struct
+{
+    unsigned int    size;
+    void            *session;
+
+} XVBA_Decode_Picture_End_Input;
+
+Status
+XVBAEndDecodePicture (
+    XVBA_Decode_Picture_End_Input *decode_picture_end_input
+);
+
+/******************************************************************/
+/*   XVBA Decode Data buffers                                     */
+/******************************************************************/
+
+/*
+ * XVBA compressed data type: XVBA_PICTURE_DESCRIPTOR_BUFFER
+ */
+typedef struct
+{
+   //VC-1, MPEG2 bitstream references
+    void            *past_surface;
+    void            *future_surface;
+
+    unsigned int    profile;
+    unsigned int    level;
+
+    unsigned int    width_in_mb;
+    unsigned int    height_in_mb;
+    unsigned int    picture_structure;
+
+    union {
+        struct {
+            unsigned int    residual_colour_transform_flag      : 1;
+            unsigned int    delta_pic_always_zero_flag          : 1;
+            unsigned int    gaps_in_frame_num_value_allowed_flag: 1;
+            unsigned int    frame_mbs_only_flag                 : 1;
+            unsigned int    mb_adaptive_frame_field_flag        : 1;
+            unsigned int    direct_8x8_inference_flag           : 1;
+            unsigned int    xvba_avc_sps_reserved               : 26;
+        } avc;
+
+        struct {
+            unsigned int    postprocflag        : 1;
+            unsigned int    pulldown            : 1;
+            unsigned int    interlace           : 1;
+            unsigned int    tfcntrflag          : 1;
+            unsigned int    finterpflag         : 1;
+            unsigned int    reserved            : 1;
+            unsigned int    psf                 : 1;
+            unsigned int    second_field        : 1;
+            unsigned int    xvba_vc1_sps_reserved : 24;
+        } vc1;
+
+        unsigned int    flags;
+    } sps_info;
+
+    unsigned char   chroma_format;
+    unsigned char   avc_bit_depth_luma_minus8;
+    unsigned char   avc_bit_depth_chroma_minus8;
+    unsigned char   avc_log2_max_frame_num_minus4;
+
+    unsigned char   avc_pic_order_cnt_type;
+    unsigned char   avc_log2_max_pic_order_cnt_lsb_minus4;
+    unsigned char   avc_num_ref_frames;
+    unsigned char   avc_reserved_8bit;
+
+    union {
+        struct {
+            unsigned int    entropy_coding_mode_flag        : 1;
+            unsigned int    pic_order_present_flag          : 1;
+            unsigned int    weighted_pred_flag              : 1;
+            unsigned int    weighted_bipred_idc             : 2;
+            unsigned int    deblocking_filter_control_present_flag  : 1;
+            unsigned int    constrained_intra_pred_flag     : 1;
+            unsigned int    redundant_pic_cnt_present_flag  : 1;
+            unsigned int    transform_8x8_mode_flag         : 1;
+            unsigned int    xvba_avc_pps_reserved           : 23;
+        } avc;
+
+        struct {
+            unsigned int    panscan_flag        : 1;
+            unsigned int    refdist_flag        : 1;
+            unsigned int    loopfilter          : 1;
+            unsigned int    fastuvmc            : 1;
+            unsigned int    extended_mv         : 1;
+            unsigned int    dquant              : 2;
+            unsigned int    vstransform         : 1;
+            unsigned int    overlap             : 1;
+            unsigned int    quantizer           : 2;
+            unsigned int    extended_dmv        : 1;
+            unsigned int    maxbframes          : 3;
+            unsigned int    rangered            : 1;
+            unsigned int    syncmarker          : 1;
+            unsigned int    multires            : 1;
+            unsigned int    reserved            : 2;
+            unsigned int    range_mapy_flag     : 1;
+            unsigned int    range_mapy          : 3;
+            unsigned int    range_mapuv_flag    : 1;
+            unsigned int    range_mapuv         : 3;
+            unsigned int    xvba_vc1_pps_reserved: 4;
+        } vc1;
+
+        unsigned int    flags;
+    } pps_info;
+
+    unsigned char   avc_num_slice_groups_minus1;
+    unsigned char   avc_slice_group_map_type;
+    unsigned char   avc_num_ref_idx_l0_active_minus1;
+    unsigned char   avc_num_ref_idx_l1_active_minus1;
+
+    char            avc_pic_init_qp_minus26;
+    char            avc_pic_init_qs_minus26;
+    char            avc_chroma_qp_index_offset;
+    char            avc_second_chroma_qp_index_offset;
+
+    unsigned short  avc_slice_group_change_rate_minus1;
+    unsigned short  avc_reserved_16bit;
+
+    unsigned int    avc_frame_num;
+    unsigned int    avc_frame_num_list[16]; ///< bit 31 is used to indicate long/short term
+    int             avc_curr_field_order_cnt_list[2];
+    int             avc_field_order_cnt_list[16][2];
+
+    unsigned char   avc_slice_group_map[810];
+
+    int             avc_intra_flag;
+    int             avc_reference;
+
+    int             xvba_reserved[14];
+
+} XVBAPictureDescriptor;
+
+/**
+ * XVBA Compressed data type: XVBA_DATA_CTRL_BUFFER
+ * (H264 and VC1 only)
+ */
+typedef struct
+{
+  unsigned int  SliceBitsInBuffer;
+  unsigned int  SliceDataLocation;
+  unsigned int  SliceBytesInBuffer;
+  unsigned int  reserved[5];
+
+} XVBADataCtrl;
+
+/**
+ * XVBA Compressed data type: XVBA_DATA_BUFFER
+ * (MPEG2 iDCT level decode only)
+ */
+typedef struct
+{
+    struct
+    {
+        unsigned short  index: 15; ///< contains rates scan index of the coefficient within the block.
+                                   ///< cannot be greater or equal to (block width * block height)
+        unsigned short  endofblock:  1;
+    } idx;
+    short   coeff;                 ///< value of the coefficient in the block; mismatch control and
+                                   ///< clipping is host.s responsibility
+
+} XVBAMpeg2Residual;
+
+typedef struct
+{
+  short horizontal;
+  short vertical;
+} XVBAMpeg2MV;
+
+typedef struct
+{
+  unsigned short    mb_address;
+  struct
+  {
+    unsigned short  mb_intra            : 1;
+    unsigned short  motion_fw           : 1;
+    unsigned short  motion_back         : 1;
+    unsigned short  reserved2           : 2;
+    unsigned short  field_residual      : 1;
+    unsigned short  mb_scan_mode        : 2;
+    unsigned short  motion_type         : 2;
+    unsigned short  reserved1           : 2;
+    unsigned short  motion_vector_sel0  : 1;
+    unsigned short  motion_vector_sel1  : 1;
+    unsigned short  motion_vector_sel2  : 1;
+    unsigned short  motion_vector_sel3  : 1;
+  } mpeg2data1;
+
+  struct
+  {
+    unsigned int    mb_data_resid_location  : 24;
+    unsigned int    skipped_mb              : 8;
+  } mpeg2data2;
+
+  unsigned short    pattern_code;
+  unsigned char     numcoeff[6];
+
+} XVBAMpeg2IntraMB;
+
+typedef struct
+{
+  unsigned short    mb_address;
+  struct
+  {
+    unsigned short  mb_intra            : 1;
+    unsigned short  motion_fw           : 1;
+    unsigned short  motion_back         : 1;
+    unsigned short  reserved2           : 2;
+    unsigned short  field_residual      : 1;
+    unsigned short  mb_scan_mode        : 2;
+    unsigned short  motion_type         : 2;
+    unsigned short  reserved1           : 2;
+    unsigned short  motion_vector_sel0  : 1;
+    unsigned short  motion_vector_sel1  : 1;
+    unsigned short  motion_vector_sel2  : 1;
+    unsigned short  motion_vector_sel3  : 1;
+  } mpeg2data1;
+
+  struct
+  {
+    unsigned int    mb_data_resid_location  : 24;
+    unsigned int    skipped_mb              : 8;
+  } mpeg2data2;
+
+  unsigned short    pattern_code;
+  unsigned char     numcoeff[6];
+
+  XVBAMpeg2MV       motion_vector[4];
+
+} XVBAMpeg2NonIntraMB;
+
+/**
+ * XVBA compressed data type: XVBA_QM_BUFFER
+ * (H264 and VC1 only)
+ */
+typedef struct
+{
+  unsigned char     bScalingLists4x4[6][16];
+  unsigned char     bScalingLists8x8[2][64];
+
+} XVBAQuantMatrixAvc;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //_XVBA_H
diff --git a/packages/x11/driver/xf86-video-fglrx-legacy/unpack b/packages/x11/driver/xf86-video-fglrx-legacy/unpack
new file mode 100755
index 0000000000..1f79207257
--- /dev/null
+++ b/packages/x11/driver/xf86-video-fglrx-legacy/unpack
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+require_eglibc $1
+
+ATI_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
+[ -d $PKG_BUILD ] && rm -rf $PKG_BUILD
+
+sh $SOURCES/$1/$ATI_PKG --extract $BUILD/$PKG_NAME-$PKG_VERSION
+
+echo "### Applying upstream patches ###"
+
+for patch in `ls $PKG_DIR/patches.upstream/*.patch`; do
+  cat $patch | patch -d \
+    `echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1
+done
diff --git a/packages/x11/xserver/xorg-server/scripts/xorg_start b/packages/x11/xserver/xorg-server/scripts/xorg_start
index 095e55d4da..c89762f723 100755
--- a/packages/x11/xserver/xorg-server/scripts/xorg_start
+++ b/packages/x11/xserver/xorg-server/scripts/xorg_start
@@ -82,6 +82,11 @@ if [ "$RUNLEVEL" = openelec ]; then
     ln -sf /usr/lib/fglrx /var/run/fglrx
     ln -sf /usr/lib/libGL_fglrx.so.1 /var/lib/libGL.so
     ln -sf /usr/lib/xorg/modules/extensions/libglx_fglrx.so /var/lib/libglx.so
+  elif [ "${xorg_driver}" = "fglrx-legacy" ]; then
+    mkdir -p /var/run
+    ln -sf /usr/lib/fglrx-legacy /var/run/fglrx
+    ln -sf /usr/lib/libGL_fglrx.so.1 /var/lib/libGL.so
+    ln -sf /usr/lib/xorg/modules/extensions/libglx_fglrx.so /var/lib/libglx.so
   else
     ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
     ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
diff --git a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
index 649457b508..c04fad3aca 100644
--- a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
+++ b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
@@ -27,18 +27,19 @@ GOTO="end_video"
 
 # check for drivers dont use the pci substem
 LABEL="subsystem_drivers"
-KERNEL=="fglrx_pci", ENV{xorg_driver}="fglrx",   GOTO="start_xorg"
-KERNEL=="nvidia",    ENV{xorg_driver}="nvidia",  GOTO="start_xorg"
-KERNEL=="vboxvideo", ENV{xorg_driver}="vboxvideo",  GOTO="start_xorg"
-KERNEL=="vmwgfx",    ENV{xorg_driver}="vmware",  GOTO="start_xorg"
+KERNEL=="fglrx_pci",        ENV{xorg_driver}="fglrx",        GOTO="start_xorg"
+KERNEL=="fglrx_legacy_pci", ENV{xorg_driver}="fglrx-legacy", GOTO="start_xorg"
+KERNEL=="nvidia",           ENV{xorg_driver}="nvidia",       GOTO="start_xorg"
+KERNEL=="vboxvideo",        ENV{xorg_driver}="vboxvideo",    GOTO="start_xorg"
+KERNEL=="vmwgfx",           ENV{xorg_driver}="vmware",       GOTO="start_xorg"
 GOTO="end_video"
 
 # check for drivers using the pci substem
 LABEL="subsystem_pci"
-DRIVER=="i915",      ENV{xorg_driver}="i915",    GOTO="start_xorg"
-DRIVER=="nouveau",   ENV{xorg_driver}="nouveau", GOTO="start_xorg"
-#DRIVER=="nvidia",    ENV{xorg_driver}="nvidia",  GOTO="start_xorg"
-DRIVER=="radeon",    ENV{xorg_driver}="radeon",  GOTO="start_xorg"
+DRIVER=="i915",      ENV{xorg_driver}="i915",                GOTO="start_xorg"
+DRIVER=="nouveau",   ENV{xorg_driver}="nouveau",             GOTO="start_xorg"
+#DRIVER=="nvidia",    ENV{xorg_driver}="nvidia",              GOTO="start_xorg"
+DRIVER=="radeon",    ENV{xorg_driver}="radeon",              GOTO="start_xorg"
 GOTO="end_video"
 
 # start Xorg