Attachment 22490 Details for Bug 36106 – Updated patch

[patch] Updated patch

dri-howto.xml.patch (text/plain), 12.81 KB, created by Sven Vermeulen (RETIRED) on 2003-12-20 11:52:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sven Vermeulen (RETIRED)

Created: 2003-12-20 11:52:12 UTC

Size: 12.81 KB

patch

obsolete

>--- dri-howto.xml.orig	2003-12-19 04:45:13.000000000 -0500
>+++ dri-howto.xml	2003-12-19 05:23:25.000000000 -0500
>@@ -5,7 +5,7 @@
> <guide link="/doc/en/dri-howto.xml">
> <title>Hardware 3D Acceleration Guide</title>
> <author title="Author">
>-	<mail link="donnie.berkholz@richmond.edu">Donnie Berkholz</mail>
>+	<mail link="spyderous@gentoo.org">Donnie Berkholz</mail>
> </author>
> <author title="Editor">
> 	<mail link="peesh@gentoo.org">Jorge Paulo</mail>
>@@ -15,8 +15,8 @@
> 
> <abstract>This document is a guide to getting 3D acceleration working using XFree-DRM with XFree86 in Gentoo Linux.</abstract>
> 
>-<version>1.0.0</version>
>-<date>June 19 2003</date>
>+<version>1.0.1</version>
>+<date>December 19 2003</date>
> 
> <chapter>
> 	<title>Introduction</title>
>@@ -31,14 +31,7 @@
> 	<section>
> 		<title>How do I get hardware 3D acceleration?</title>
> 		<body>
>-		<p>In many cases, both binary and open-source drivers exist. Open-source drivers are preferable since we're using Linux and open source is one of its underlying principles. Sometimes, binary drivers are the only option, like with nVidia's cards. 
>-
>-        Binary drivers include media-video/mgavideo for Matrox and media-video/ati-drivers for ATI cards. Other open-source drivers include media-video/kyro-kernel for KyroII cards and media-video/ati-gatos for ATI cards, which aim to support ATI's video capabilities more fully.</p>
>+		<p>In many cases, both binary and open-source drivers exist. Open-source drivers are preferable since we're using Linux and open source is one of its underlying principles. Sometimes, binary drivers are the only option, like with nVidia's cards. Binary drivers include media-video/nvidia-kernel and media-video/nvidia-glx for nVidia cards, media-video/mgavideo for Matrox cards and media-video/ati-drivers for ATI cards. Other open-source drivers include media-video/kyro-kernel for KyroII cards and media-video/ati-gatos for ATI cards, which aim to support ATI's video capabilities more fully.</p>
> 		</body>
> 	</section>
> 
>@@ -54,7 +47,7 @@
> 	<section>
> 		<title>What is XFree-DRM and how does it relate to regular XFree86?</title>
> 		<body>
>-		<p>XFree-DRM is an <e>enhancement</e> to XFree86 that adds 3D acceleration for cards to which XFree86 doesn't provide acceleration.</p>
>+		<p>XFree-DRM is an <e>enhancement</e> to XFree86 that adds 3D acceleration for cards by adding the kernel module necessary for direct rendering.</p>
> 		</body>
> 	</section>
> 
>@@ -62,7 +55,7 @@
> 	<section>
> 		<title>Purpose</title>
> 		<body>
>-		<p>This guide is for people that can't get direct rendering working with just XFree. XFree-DRM works for 3dfx, gamma, i8x0, matrox, rage128, radeon and sis drivers. There's also some support for mach64 in the CVS sources -- check out <uri link="http://www.retinalburn.net/linux/dri_status.html">this site</uri> and the <uri link="http://www.retinalburn.net/linux/dri_HOWTO.html">howto</uri>.  Since the 2.4 kernels' Direct Rendering Manager (DRM) doesn't support XFree 4.3, the xfree-drm package is needed. If you're using a 2.5 kernel, its DRM supports XFree 4.3; so unless your card is so new it doesn't get direct rendering, don't bother with this guide. See the <uri link="http://dri.sourceforge.net">DRI homepage</uri> for more info and documentation. </p>
>+		<p>This guide is for people who can't get direct rendering working with just XFree. XFree-DRM works for 3dfx, gamma, i8x0, matrox, rage128, radeon, mach64 (as of xfree-drm-4.3.0-r7) and sis300 series drivers.  Since the 2.4 kernels' Direct Rendering Manager (DRM) doesn't support XFree 4.3, the xfree-drm package is needed. If you're using a 2.6 kernel, its DRM supports XFree 4.3; Gentoo's XFree-DRM package is not yet working on 2.6 kernels. See the <uri link="http://dri.sourceforge.net">DRI homepage</uri> for more info and documentation. </p>
> 		</body>
> 	</section>
> 
>@@ -70,7 +63,7 @@
> 	<section>
> 		<title>Feedback</title>
> 		<body>
>-		<p>For suggestions, questions, etc., e-mail <mail link="donnie.berkholz@richmond.edu">Donnie Berkholz</mail>.</p>
>+		<p>With suggestions, questions, etc., e-mail <mail link="spyderous@gentoo.org">Donnie Berkholz</mail>.</p>
> 		</body>
> 	</section>
> </chapter>
>@@ -111,11 +104,11 @@
>   &lt;*&gt; MTRR (Memory Type Range Register) support
> Character devices ---&gt;
>   &lt;*&gt; /dev/agpgart (AGP Support)
>-  [*] Intel 440LX/BX/GX and I815/I820/I830M/I830MP/I840/I845/I850/I860 support
>+  [M] Intel 440LX/BX/GX and I815/I820/I830M/I830MP/I840/I845/I850/I860 support
> <codenote>Enable your chipset instead of the above.</codenote>
>   [ ] Direct Rendering Manager (XFree86 DRI support)
> 		</pre>
>-		<p>Make sure the Direct Rendering Manager (DRM) is <e>off</e>. The XFree-DRM package will provide its own. The kernel's version is for XFree 4.2.</p>
>+		<p>Make sure the Direct Rendering Manager (DRM) is <e>off</e>. The XFree-DRM package will provide its own. The 2.4 kernel's version is for XFree 4.2.</p>
> 		</body>
> 	</section>
> 
>@@ -163,7 +156,7 @@
>      ...
> EndSection
> ...
>-Section "DRI"
>+Section "dri"
>      Mode 0666
> EndSection
> 		</pre>
>@@ -187,7 +180,7 @@
> direct rendering: Yes
> <codenote>If it says "No," you don't have 3D acceleration.</codenote>
> # <i>glxgears</i>
>-<codenote>Test your frames per second (FPS) at the default size. Do this while the CPU is as idle as possible.</codenote>
>+<codenote>Test your frames per second (FPS) at the default size. The number should be significantly higher than before installing xfree-drm. Do this while the CPU is as idle as possible.</codenote>
> 		</pre>
> 		</body>
> 	</section>
>@@ -205,7 +198,7 @@
> 	<section>
> 		<title>Do you need the CVS?</title>
> 		<body>
>-		<p>First you have to check whether the xfree-drm package works. If it doesn't and you have a very new card, you might want to consider the CVS sources. The xfree-drm package currently supports at least the Radeon 9000.</p>
>+		<p>First you have to check whether the xfree-drm package works. If it doesn't and you have checked your logs to verify it's not a configuration error, you might want to consider the CVS sources. There are also daily driver snapshots available if you do not wish to build the full CVS.</p>
> 		</body>
> 	</section>
> 	<section>
>@@ -222,7 +215,7 @@
> 	<section>
> 		<title>Install the CVS sources</title>
> 		<body>
>-		<p>Follow this guide through "Compile and install your kernel." Then we'll move to step 6 of the <uri link="http://dri.sourceforge.net/doc/DRIcompile.html">DRI compilation guide</uri> and follow it through step 8.3.</p>
>+		<p>Follow this guide through "Compile and install your kernel." Then continue with this guide, which tracks step 6 of the <uri link="http://dri.sourceforge.net/doc/DRIcompile.html">DRI compilation guide</uri> and follows it through step 8.3.</p>
> 		</body>
> 	</section>
> 
>@@ -241,7 +234,7 @@
> # <i>cvs -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri login</i>
> <codenote>(hit ENTER when prompted for a password)</codenote>
> # <i>cvs -z3 -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri co xc</i>
>-<codenote>The -z3 flag causes compression to be used in order to reduce the download time.</codenote>
>+<codenote>The -z3 flag causes compression to be used to reduce the download time.</codenote>
> 		</pre>
> 		</body>
> 	</section>
>@@ -301,10 +294,7 @@
>             /* #define DoLoadableServer NO */
>             #define SharedLibFont NO
> 		</pre>
>-		<p>The ProjectRoot variable specifies where the XFree86 files will be installed. We recommend installing the DRI files over your existing XFree86 installation - it's generally safe to do and less error-prone. This policy is different from what we used to recommend.</p>
>-		<p>If XFree86 4.x is not installed in <path>/usr/X11R6/</path> you'll have to add the following to the host.def file:</p>
> 		<pre>
>-#define ProjectRoot pathToYourXFree86installation
> <codenote>Note the XF86CardDrivers line to be sure your card's driver is listed.</codenote>
> <codenote>If you want to enable 3DNow! optimizations in Mesa and the DRI drivers, you should add the following:</codenote>
> #define MesaUse3DNow YES
>@@ -327,7 +317,7 @@
> # <i>cd ~/DRI-CVS/build/xc/</i>
> # <i>make World &gt;&amp; world.log</i>
> 		</pre>
>-		<p>One user suggests it may also be necessary to do the following:</p>
>+		<p>It may also be necessary to do the following, depending on what you placed in host.def:</p>
> 		<pre>
> # <i>cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel</i>
> # <i>make -f Makefile.linux radeon.o</i>
>@@ -341,21 +331,18 @@
> 
> 
> 	<section>
>-		<title>Install your driver</title>
>+		<title>Install the CVS</title>
> 		<body>
> 		<p>Verify that the DRI kernel module(s) for your system were built:</p>
> 		<pre>
> # <i>cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel; ls</i>
> 		</pre>
> 		<p>For the 3dfx Voodoo, you should see <path>tdfx.o</path>. For the Matrox G200/G400, you should see <path>mga.o</path>. For the ATI Rage 128, you should see <path>r128.o</path>. For the ATI Radeon, you should see <path>radeon.o</path>. For the Intel i810, you should see <path>i810.o</path>. If the DRI kernel module(s) failed to build, you should verify that you're using the right version of the Linux kernel. The most recent kernels are not always supported.</p>
>-		<p>Copy all of your driver files to your XFree86 installation. You may wish to back up replaced files. This is an example using a Radeon card. If you have another card, copy the appropriate files. If you don't know what they are, check the directory to which you're going to copy them to see what's there.</p>
>+		<p>Install over your XFree86 installation. You may wish to back up xfree.</p>
> 		<pre>
>-# <i>cd ~/DRI-CVS/build/xc/exports/lib/modules/</i>
>-# <i>cp dri/r200_dri.so /usr/X11R6/lib/modules/dri/</i>
>-# <i>cp drivers/atimisc_drv.o /usr/X11R6/lib/modules/drivers/</i>
>-# <i>cp drivers/radeon_drv.o /usr/X11R6/lib/modules/drivers/</i>
>-# <i>cp extensions/libdri.a /usr/X11R6/lib/modules/extensions/</i>
>-# <i>cp linux/libdrm.a /usr/X11R6/lib/modules/linux/</i>
>+# <i>quickpkg xfree</i>
>+<codenote>This backs up your XFree86 package.</codenote>
>+# <i>make install</i>
> 		</pre>
> 		<p>Follow the "Configure XF86Config" section above.</p>
> 		<p>To load the appropriate DRM module in your running kernel, copy the kernel module to <path>/lib/modules/`uname -r`/kernel/drivers/char/drm/</path> then run <c>modules-update</c> and restart your X server. If you're not running the kernel you'll be using it in, instead of <c>`uname -r`,</c> use that kernel's name.</p>
>@@ -391,15 +378,21 @@
> <chapter>
> 	<title>Troubleshooting</title>
> 	<section>
>+		<title>It doesn't work. I just recompiled my kernel or switched to a new one.</title>
>+		<body>
>+		<p>Whenever you rebuild your kernel or switch to another kernel, you'll have to rebuild the kernel module.  Note that you don't need to remerge xfree, but you will need to remerge xfree-drm.</p>
>+		</body>
>+	</section>
>+	<section>
> 		<title>It doesn't work. I don't have rendering, and I can't tell why.</title>
> 		<body>
>-		<p>Try <c>insmod radeon</c> before you start the X server. Also, try building agpgart as a module instead of into the kernel.</p>
>+		<p>Try <c>insmod radeon</c> before you start the X server. Also, try building agpgart into the kernel instead of as a module.</p>
> 		</body>
> 	</section>
> 	<section>
> 		<title>When I <c>startx</c>, I get this error: "[drm] failed to load kernel module agpgart"</title>
> 		<body>
>-		<p>That's because you compiled agpgart into the kernel instead of as a module. Ignore it.</p>
>+		<p>That's because you compiled agpgart into the kernel instead of as a module. Ignore it unless you're having problems.</p>
> 		</body>
> 	</section>
> 	<section>
>@@ -417,7 +410,7 @@
> 	<section>
> 		<title>It doesn't work. My card is so incredibly new and cool that it isn't supported at all.</title>
> 		<body>
>-		<p>Try out the binary drivers. For ati-drivers, a listing is at <uri>http://www.schneider-digital.de/html/download_ati.html</uri>. If those don't support it, use VESA. It's slow, but it works. Check the drivers in the future because they will support your card soon.</p>
>+		<p>Try out the binary drivers. For ati-drivers, a listing is at <uri>http://www.schneider-digital.de/html/download_ati.html</uri>. If those don't support it, use fbdev. It's slow, but it works.</p>
> 		</body>
> 	</section>
> 	<section>
>@@ -432,6 +425,21 @@
> 
> 
> <chapter>
>+	<title>Acknowledgments</title>
>+	<section>
>+		<body>
>+		<p>
>+			<ol>
>+				<li>Christopher Webber for suggesting a troubleshooting question about changing or recompiling kernels</li>
>+				<li>Steve, for suggesting consistency between the cases of dri and DRI in XF86Config</li>
>+			</ol>
>+		</p>
>+		</body>
>+	</section>
>+</chapter>
>+
>+
>+<chapter>
> 	<title>References</title>
> 	<section>
> 		<body>

Actions: View | Diff

Attachments on bug 36106: 22430 | 22490