From a8f981492da9ee72e8ac53551790da411543d04f Mon Sep 17 00:00:00 2001
From: Leon Anavi <leon.anavi@konsulko.com>
Date: Mon, 4 Nov 2019 23:22:40 +0200
Subject: [PATCH] agl_raspberrypi3.inc: Switch to firmware KMS

Swith to firmware KMS with appropriate Linux kernel and Mesa
version to support both HDMI and the official 7" Raspberry Pi
touch screen display on Raspberry Pi 3B/B+ and 4. Device tree
changes are not required for firmware KMS.

Bug-AGL: SPEC-2465

Change-Id: I5f8f62c0151b7eb79ab1f96419d9c62469a1554e
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
 meta-agl-bsp/conf/include/agl_raspberrypi3.inc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
index cc3074858..94dc5acee 100644
--- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
+++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
@@ -14,8 +14,19 @@ UBOOT_MACHINE = "rpi_3_32b_config"
 
 KERNEL_IMAGETYPE = "uImage"
 
+PREFERRED_VERSION_linux-raspberrypi = "4.19%"
+RPI_KERNEL_DEVICETREE_remove_raspberrypi3 = "bcm2708-rpi-0-w.dtb"
+RPI_KERNEL_DEVICETREE_OVERLAYS_remove_raspberrypi3 = "overlays/lirc-rpi.dtbo"
+RPI_KERNEL_DEVICETREE_OVERLAYS_append_raspberrypi3 = " overlays/vc4-fkms-v3d.dtbo"
+
+# Set appropriate version of Mesa for Raspberry Pi 3 and 4
+PREFERRED_VERSION_mesa = "19.1%"
+
 MACHINE_FEATURES += "vc4graphics"
 
+# Switch to firmware KMS to support the official DSI touchscreen display
+VC4DTBO = "vc4-fkms-v3d"
+
 # For libomxil
 #LICENSE_FLAGS_WHITELIST = "commercial"
 
-- 
2.16.6