add links to .configs, fix other links, fix CMA setup.

1 files changed, 6 insertions, 10 deletions

diff --git a/VC4.mdwn b/VC4.mdwn
index 932672a..f5345fa 100644
--- a/VC4.mdwn
+++ b/VC4.mdwn
@@ -8,7 +8,7 @@ Builds of raspbian using the driver can be found at <http://sukzessiv.net/~gohai
 
 The kernel driver can be found at: <https://github.com/anholt/linux/tree/vc4-kms-v3d>.
 
-A port to the downstream 2709 kernel for Raspberry Pi 2 can be found at <https://github.com/anholt/linux/tree/vc4-kms-v3d-rpi2> though this page doesn't have instructions for building it.
+A port to the downstream 2709 kernel for Raspberry Pi 2 can be found at <https://github.com/anholt/linux/tree/vc4-kms-v3d-rpi2>.
 
 General Raspberry Pi upstreaming status can be found at <http://elinux.org/RPi_Upstreaming>
 ## 3D driver status
@@ -106,23 +106,19 @@ Currently we call our tiles in raster order.  If you do a hilbert fractal-like w
 
 This is not a complete guide, just some details you'll definitely need.
 
-Get the kernel.  https://github.com/anholt/linux/tree/vc4-kms-v3d.
+Get the kernel from [vc4-kms-v3d](https://github.com/anholt/linux/tree/vc4-kms-v3d) (upstream-based, bcm2835, Raspberry Pi 1 only) or [vc4-kms-v3d-rpi2](https://github.com/anholt/linux/tree/vc4-kms-v3d-rpi2) (Raspberry Pi foundation-based, bcm2708/9, Raspberry Pi 1/2).
 
-You should start with the defconfig for 2835.
+Download the kernel .config for [upstream](http://people.freedesktop.org/~anholt/dotconfig-vc4-drm-next-2015-11-04.txt]) or [Pi foundation](http://people.freedesktop.org/~anholt/dotconfig-vc4-kms-v3d-rpi2-2015-11-04.txt) and then customize.
 
-You need CONFIG_DRM_VC4=y (not m, or it won't load).
-
-You need CONFIG_I2C_BCM2835=y for the DDC I2C adapter.
-
-You need CONFIG_CMA_SIZE_MBYTES=128 (or, apparently, cma=128M on the kernel command line), or you'll get "vc4-drm vc4-drm.0: failed to allocate buffer with size 7057408".  (Smaller values such as 64M will cause allocation failures for even small apps like openarena).
-
-CONFIG_FB_BCM2708 must be unset.
+If you're starting from your own .config, you need CONFIG_DRM_VC4=y (not m, or it won't load) and CONFIG_I2C_BCM2835=y.  CONFIG_FB_BCM2708 must be unset.
 
 You have to add the following lines to /boot/config.txt:
 
     mask_gpu_interrupt0=0x400   # VPU shouldn't handle V3D interrupts
     avoid_warnings=2            # VPU shouldn't smash our display setup.
 
+Your kernel cmdline.txt needs "cma=256M@512M"
+
 ## Building mesa
 
     sudo apt-get build-dep libgl1-mesa-dri