--- xml/htdocs/doc/en/xorg-config.xml 2011/09/02 19:07:12 1.48 +++ xml/htdocs/doc/en/xorg-config.xml 2012/07/24 12:12:51 1.50 @@ -1,6 +1,6 @@ - + The X Server Configuration HOWTO @@ -22,8 +22,8 @@ -10 -2011-09-02 +12 +2012-07-24 What is the X Window Server? @@ -93,7 +93,7 @@

Before you can install Xorg, you need to prepare your system for it. First, we'll set up the kernel to support input devices and video cards. Then we'll -prepare /etc/make.conf so that the right drivers and Xorg packages +prepare /etc/portage/make.conf so that the right drivers and Xorg packages are built and installed.

@@ -162,8 +162,7 @@ /dev/agpgart (AGP Support) ---> <*> Intel 440LX/BX/GX, I8xx and E7x05 chipset support Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) ---> - <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) - i915 driver + <*> Intel 8xx/9xx/G3x/G4x/HD Graphics [*] Enable modesetting on intel by default @@ -172,16 +171,10 @@ 

-(Enable DRM)
 Device Drivers --->
   Graphics support --->
-  <*>  Direct Rendering Manager --->
-
-(Nouveau is currently in the Staging drivers section)
-Device Drivers --->
-  Staging drivers --->
-  [ ]  Exclude Staging drivers from being built
-  <*>    Nouveau (nVidia) cards
+    Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->
+    <*>    Nouveau (nVidia) cards

@@ -198,22 +191,33 @@ [*] Include in-kernel firmware blobs in kernel binary # RadeonHD 2000, 3000, and 4000 series cards: (radeon/R600_rlc.bin radeon/R700_rlc.bin) External firmware blobs - # RadeonHD 5000, a.k.a Evergreen, and newer cards: + # RadeonHD 5000, a.k.a Evergreen: (radeon/CEDAR_me.bin radeon/CEDAR_pfp.bin radeon/CEDAR_rlc.bin radeon/CYPRESS_me.bin radeon/CYPRESS_pfp.bin radeon/CYPRESS_rlc.bin radeon/JUNIPER_me.bin radeon/JUNIPER_pfp.bin radeon/JUNIPER_rlc.bin radeon/REDWOOD_me.bin radeon/REDWOOD_pfp.bin radeon/REDWOOD_rlc.bin) External firmware blobs - # Radeon HD 6000 series Fusion APUs: + # Radeon HD 6000/7300 series Fusion APUs: (radeon/PALM_me.bin radeon/PALM_pfp.bin radeon/SUMO2_me.bin radeon/SUMO2_pfp.bin radeon/SUMO_me.bin radeon/SUMO_pfp.bin radeon/SUMO_rlc.bin) External firmware blobs - # Radeon HD 6400-6900 aka. Northern Islands: + # Radeon HD 6400-7600 aka. Northern Islands: (radeon/BARTS_mc.bin radeon/BARTS_me.bin radeon/BARTS_pfp.bin radeon/BTC_rlc.bin radeon/CAICOS_mc.bin radeon/CAICOS_me.bin radeon/CAICOS_pfp.bin radeon/CAYMAN_mc.bin radeon/CAYMAN_me.bin radeon/CAYMAN_pfp.bin radeon/CAYMAN_rlc.bin radeon/TURKS_mc.bin radeon/TURKS_me.bin radeon/TURKS_pfp.bin) External firmware blobs + # Radeon HD 7500/7600 series Fusion APUs: + (radeon/ARUBA_me.bin radeon/ARUBA_pfp.bin radeon/ARUBA_rlc.bin) + External firmware blobs + # Radeon HD 7700-7900 aka. Southern Islands: + (radeon/PITCAIRN_ce.bin radeon/PITCAIRN_mc.bin radeon/PITCAIRN_me.bin + radeon/PITCAIRN_pfp.bin radeon/PITCAIRN_rlc.bin radeon/TAHITI_ce.bin + radeon/TAHITI_mc.bin radeon/TAHITI_me.bin radeon/TAHITI_pfp.bin + radeon/TAHITI_rlc.bin radeon/VERDE_ce.bin radeon/VERDE_mc.bin + radeon/VERDE_me.bin radeon/VERDE_pfp.bin radeon/VERDE_rlc.bin) + External firmware blobs + # all: (/lib/firmware/) Firmware blobs root directory (Enable Radeon KMS support) @@ -232,7 +236,7 @@

Now that you're done setting up KMS, continue with preparing -/etc/make.conf in the next section. +/etc/portage/make.conf in the next section.

@@ -243,7 +247,7 @@

Now that your kernel is prepared, you have to configure two important variables -in the /etc/make.conf file before you can install Xorg. +in the /etc/portage/make.conf file before you can install Xorg.

@@ -283,7 +287,7 @@

Now you should decide which drivers you will use and add necessary settings to -the /etc/make.conf file: +the /etc/portage/make.conf file: