Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision f14424398ae293d2167f68670a6f3c507254bb9a)
+++ x/installing/x7driver.xml	(revision bb9728099f29795aaa463687b87e662613785838)
@@ -4,4 +4,16 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
+
+  <!ENTITY radeon-wiki "http://wiki.x.org/wiki/RadeonFeature">
+  <!ENTITY radeon-marketing-names "&radeon-wiki;#Decoder_ring_for_engineering_vs_marketing_names">
+
+  <!ENTITY glamor-egl-version "0.5.0">
+
+  <!ENTITY glamor-egl-download-http "&sources-anduin-other-http;/glamor-egl-&glamor-egl-version;.tar.xz">
+  <!ENTITY glamor-egl-download-ftp  "&sources-anduin-other;/glamor-egl-&glamor-egl-version;.tar.xz">
+  <!ENTITY glamor-egl-md5sum        "8b8c3ca4d502313df8e62c01c000e10d">
+  <!ENTITY glamor-egl-size          "100 KB">
+  <!ENTITY glamor-egl-buildsize     "13 MB">
+  <!ENTITY glamor-egl-time          "0.1 SBU">
 
   <!ENTITY xorg-evdev-driver-version "2.7.3">
@@ -194,4 +206,17 @@
     </note>
 
+    <sect3 id="xorg-modules">
+      <title>Xorg Modules</title>
+
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            <xref linkend="glamor-egl"/>
+          </para>
+        </listitem>
+      </itemizedlist>
+
+    </sect3>
+
     <sect3 id="xorg-input-drivers">
       <title>Xorg Input Drivers</title>
@@ -296,4 +321,166 @@
 
   </sect2>
+
+  <!-- Begin Glamor EGL -->
+  <sect2 id="glamor-egl" xreflabel="Glamor EGL-&glamor-egl-version;">
+
+    <title>Glamor EGL-&glamor-egl-version;</title>
+
+    <indexterm zone="glamor-egl">
+      <primary sortas="a-glamor-egl">glamor-egl</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Glamor EGL</title>
+
+      <para>
+        The <application>Glamor EGL</application> package contains a
+        GL-based rendering acceleration library for X server.
+      </para>
+
+      &lfs72_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&glamor-egl-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&glamor-egl-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &glamor-egl-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &glamor-egl-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &glamor-egl-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &glamor-egl-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Additional Downloads</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Required patch:
+            <ulink url="&patch-root;/glamor-egl-&glamor-egl-version;-fixes-1.patch"/>
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Glamor EGL Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="xorg-server"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/glamor-egl"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Glamor EGL</title>
+
+      <para>
+        Install <application>Glamor EGL</application> by running the following
+        commands:
+      </para>
+
+<screen><userinput>patch -Np1 -i ../glamor-egl-&glamor-egl-version;-fixes-1.patch &amp;&amp;
+autoreconf -fi &amp;&amp;
+./configure $XORG_CONFIG --enable-glx-tls &amp;&amp;
+make</userinput></screen>
+
+      <para>
+        This package does not come with a test suite.
+      </para>
+
+      <para>
+        Now, as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+    </sect3>
+
+    <sect3>
+      <title>Command Explanations</title>
+
+      <para>
+        <parameter>--enable-glx-tls</parameter>: This switch enables
+        TLS support in GLX.
+      </para>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Library</segtitle>
+        <segtitle>Installed Xorg Module</segtitle>
+
+        <seglistitem>
+          <seg>
+            libglamor.so
+          </seg>
+          <seg>
+            libglamoregl.so
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <variablelist>
+        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
+        <?dbfo list-presentation="list"?>
+        <?dbhtml list-presentation="table"?>
+
+        <varlistentry id="libglamoregl">
+          <term><filename class="libraryfile">libglamoregl.so</filename></term>
+          <listitem>
+            <para>
+              contains functions to create and initialize OpenGL/EGL context.
+            </para>
+            <indexterm zone="glamor-egl libglamoregl">
+              <primary sortas="c-libglamoregl">libglamoregl.so</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="libglamor">
+          <term><filename class="libraryfile">libglamor.so</filename></term>
+          <listitem>
+            <para>
+              contains the <application>Glamor</application> rendering functions.
+            </para>
+            <indexterm zone="glamor-egl libglamor">
+              <primary sortas="c-libglamor">libglamor.so</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
+
+    </sect3>
+
+  </sect2>
+  <!-- End Glamor EGL -->
 
   <!-- Begin Xorg Evdev Driver -->
@@ -946,5 +1133,5 @@
         The <application>Xorg ATI Driver</application> package contains the X.Org
         Video Driver for ATI Radeon video cards including all chipsets ranging
-        from R100 to R700 including newer Radeon HD ones.
+        from R100 to R900 and the newer RAxx chipsets.
       </para>
 
@@ -954,5 +1141,5 @@
         <para>
           For Direct Rendering to work with newer Radeon Cards (r300 and later chipsets),
-          you will need to enable building of r300 and r600 Gallium drivers in
+          you will need to enable building of r300, r600 and radeonsi Gallium drivers in
           <xref linkend="mesalib"/> instructions. Also, some cards will require Firmware
           to be available when kernel driver is loaded. Firmware can be obtained from
@@ -1000,10 +1187,5 @@
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <ulink url="http://www.freedesktop.org/wiki/Software/Glamor">Glamor</ulink>
+        <xref linkend="glamor-egl"/>
       </para>
 
@@ -1040,5 +1222,5 @@
       </para>
 
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
+<screen><userinput>./configure $XORG_CONFIG --enable-glamor &amp;&amp;
 make</userinput></screen>
 
@@ -1052,4 +1234,52 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+    </sect3>
+
+    <sect3>
+      <title>Command Explanations</title>
+
+      <para>
+        <parameter>--enable-glamor</parameter>: This switch enables
+        new GL-based acceleration.
+      </para>
+
+    </sect3>
+
+    <sect3>
+      <title>Glamor Acceleration</title>
+
+      <para>
+        Glamor is an acceleration library which uses cards' 3D capabilities
+        to accelerate 2D rendering. Glamor acceleration is required for
+        Radeon "South Islands" GPUs which use "radeonsi" Gallium3D driver
+        from <xref linkend="mesalib"/>. To see which cards fall under
+        "South Islands" category, read the
+        <ulink url="&radeon-marketing-names;">
+        Decoder ring for engineering vs marketing names</ulink>. Please note
+        that Glamor acceleration can be used with other chips as well, but
+        it has not been tested recently.
+      </para>
+
+      <para>
+        Glamor acceleration is not enabled by default. You have to use a
+        <filename>xorg.conf</filename> file to enable it. To enable
+        Glamor, create the following
+        <filename>/etc/X11/xorg.conf</filename> as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+ 
+<screen role="root"><userinput>cat &gt;&gt; /etc/X11/xorg.conf &lt;&lt; "EOF"
+<literal>Section "Module"
+        Load "dri2"
+        Load "glamoregl"
+EndSection
+
+Section "Device"
+        Identifier "radeon"
+        Driver "radeon"
+        Option "AccelMethod" "glamor"
+EndSection</literal>
+EOF</userinput></screen>
+
     </sect3>
 
@@ -1259,5 +1489,5 @@
         The <application>Xorg Intel Driver</application> package contains the X.Org
         Video Driver for Intel integrated video cards including 8xx, 9xx, Gxx, Qxx
-        and HD graphics processors.
+        and HD graphics processors (SandyBridge, IvyBridge and Haswell).
       </para>
 
