From 053c64876846fe3a702b2be767fd5633c6bbd616 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Mon, 12 Oct 2015 17:15:11 +0000
Subject: Follow some instructions to get VC4 working

http://dri.freedesktop.org/wiki/VC4/
---
 strata/bsp-rpi2.morph               | 6 +++---
 strata/bsp-rpi2/linux-rpi2.morph    | 3 +++
 strata/bsp-rpi2/rpi2-firmware.morph | 7 ++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/strata/bsp-rpi2.morph b/strata/bsp-rpi2.morph
index e060ad82..df0d535e 100644
--- a/strata/bsp-rpi2.morph
+++ b/strata/bsp-rpi2.morph
@@ -24,9 +24,9 @@ chunks:
   unpetrify-ref: master
 - name: linux-rpi2
   morph: strata/bsp-rpi2/linux-rpi2.morph
-  repo: https://github.com/raspberrypi/linux.git
-  ref: 499958c660a8558ddb72d3f0c3ac51a8e9b63fc2
-  unpetrify-ref: rpi-4.1.y
+  repo: https://github.com/anholt/linux
+  ref: 9268e6bf7ba2a6832c0288555bf592a63614a754
+  unpetrify-ref: vc4-kms-v3d-rpi2
   build-depends:
   - grep
 - name: linux-firmware-rpi2
diff --git a/strata/bsp-rpi2/linux-rpi2.morph b/strata/bsp-rpi2/linux-rpi2.morph
index 44f78a22..0cb98f09 100644
--- a/strata/bsp-rpi2/linux-rpi2.morph
+++ b/strata/bsp-rpi2/linux-rpi2.morph
@@ -104,6 +104,9 @@ configure-commands:
 - scripts/config -e IP_SET_HASH_NETIFACE
 - scripts/config -e IP_SET_LIST_SET
 - scripts/config -e BOOT_PRINTK_DELAY
+- scripts/config -e DRM_VC4
+- scripts/config -e I2C_BCM2835
+- scripts/config -d FB_BCM2708
 - yes '' | make ARCH=arm oldconfig
 build-commands:
 - make $MAKEFLAGS ARCH=arm zImage dtbs
diff --git a/strata/bsp-rpi2/rpi2-firmware.morph b/strata/bsp-rpi2/rpi2-firmware.morph
index d0745ecb..fdde0a67 100644
--- a/strata/bsp-rpi2/rpi2-firmware.morph
+++ b/strata/bsp-rpi2/rpi2-firmware.morph
@@ -10,5 +10,10 @@ install-commands:
 - cp boot/LICENCE.broadcom "$DESTDIR"/boot/
 - |
   cat << EOF > "$DESTDIR"/boot/cmdline.txt
-  dwc_otg.fiq_fix_enable=2 console=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=btrfs rootwait rootflags=subvol=systems/default/run
+  dwc_otg.fiq_fix_enable=2 cma=128M console=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=btrfs rootwait rootflags=subvol=systems/default/run
+  EOF
+- |
+  cat << EOF > "$DESTDIR"/boot/config.txt
+  mask_gpu_interrupt0=0x400   # VPU shouldn't handle V3D interrupts
+  avoid_warnings=2            # VPU shouldn't smash our display setup.
   EOF
-- 
cgit v1.2.1