[meta-raspberrypi][PATCH v2 0/4] Add support for 4.1 kernel with vc4 DRM/KMS driver

[meta-raspberrypi][PATCH v2 0/4] Add support for 4.1 kernel with vc4 DRM/KMS driver

[Javier Martinez Canillas]

Hello Andrei,

This series adds support for Eric Anholt's v4.1 kernel, that has support
for the vc4 DRM/KMS driver. Which is the new open source graphics driver
stack for the Raspberry Pi to be used instead of the userland driver.

This is a second version of the series which addresses feedback provided
by Andreas Müller, Khem Raj, Petter Mabäcker and you. The first version
of the series can be found at [0]. Some of the v1 patches have already
been picked and are now in the meta-raspberrypi master branch.

The v4.1 kernel is under heavy development so is a work-in-progress and
should not be used in production. That's why it's not set as the default
virtual/kernel provider but the user can change the default providers in
case wants to use the VC4 driver.

But even when it's still a development kernel, having the recipe in the
meta-raspberrypi will allow people to test it. We have been using it in
the Tizen RPi2 port [1] for some time. The patches in the series are for:

Patch 1/4 allows to set the mask_gpu_interrupt0 option in config.txt

Patch 2/4 adds a recipe for the 4.1 and some patches to make it stable

Patch 3/4 Documents how to switch the default providers for vc4 gfx stack

Patch 4/4 Adds a section to the README that explains that two gfx stacks
are available and that the user can change the default providers.

As discussed in v1, the following has to be added in local.conf to build:

KERNEL_DEVICETREE = " \
    bcm2708-rpi-b.dtb \
    bcm2708-rpi-b-plus.dtb \
    bcm2709-rpi-2-b.dtb \
    \
    overlays/hifiberry-amp-overlay.dtb \
    overlays/hifiberry-dac-overlay.dtb \
    overlays/hifiberry-dacplus-overlay.dtb \
    overlays/hifiberry-digi-overlay.dtb \
    overlays/iqaudio-dac-overlay.dtb \
    overlays/iqaudio-dacplus-overlay.dtb \
    overlays/lirc-rpi-overlay.dtb \
    overlays/pps-gpio-overlay.dtb \
    overlays/w1-gpio-overlay.dtb \
    overlays/w1-gpio-pullup-overlay.dtb \
    "

[0]: https://www.mail-archive.com/yocto@yoctoproject.org/msg25164.html
[1]: http://blogs.s-osg.org/tizen-rpi2-now-supporting-3d-acceleration/

Best regards,
Javier

Changes in v2:
 - Fix commit message about mask GPU irq option. Suggested by Andrei Gherzan.
- Add a linux-raspberrypi-vc4 recipe insted of a linux-raspberrypi one.
  Suggested by Petter Mabäcker, Andreas Müller and Andrei Gherzan.
- Split the readme change in a separate patch. Suggested by Andrei Gherzan.
- Don't make the vc4 patches inclusion conditional since will always be
  needed when choosing the recipe. Suggested by Andrei Gherzan.
- Don't add a feature and allow users to change the default provider manually
  aided by a comment. Suggested by Andreas Müller and Andrei Gherzan.

Derek Foreman (3):
  rpi-config: Allow to mask GPU irqs
  linux-raspberrypi: Add a 4.1 linux kernel with vc4 support
  rpi-default-providers: Document how to switch providers for vc4 gfx
    stack

Javier Martinez Canillas (1):
  README: Add a section about graphic stacks

 README                                             |  31 ++++--
 conf/machine/include/rpi-default-providers.inc     |  10 ++
 recipes-bsp/bootfiles/rpi-config_git.bb            |   6 ++
 ..._defconfig-Enable-config-options-for-vc4-.patch |  48 +++++++++
 ...-ARM-dts-Fix-i2c-for-bcm2709-RPI2-B-board.patch |  85 +++++++++++++++
 .../0003-drm-vc4-Use-the-fbdev_cma-helpers.patch   | 115 +++++++++++++++++++++
 .../0004-drm-vc4-Allow-vblank-to-be-disabled.patch |  26 +++++
 .../0005-drm-vc4-Disable-KMS-operations.patch      |  95 +++++++++++++++++
 .../linux/linux-raspberrypi-vc4/defconfig          |   1 +
 recipes-kernel/linux/linux-raspberrypi-vc4_4.1.bb  |  12 +++
 10 files changed, 421 insertions(+), 8 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-raspberrypi-vc4/0001-ARM-bcm2709_defconfig-Enable-config-options-for-vc4-.patch
 create mode 100644 recipes-kernel/linux/linux-raspberrypi-vc4/0002-ARM-dts-Fix-i2c-for-bcm2709-RPI2-B-board.patch
 create mode 100644 recipes-kernel/linux/linux-raspberrypi-vc4/0003-drm-vc4-Use-the-fbdev_cma-helpers.patch
 create mode 100644 recipes-kernel/linux/linux-raspberrypi-vc4/0004-drm-vc4-Allow-vblank-to-be-disabled.patch
 create mode 100644 recipes-kernel/linux/linux-raspberrypi-vc4/0005-drm-vc4-Disable-KMS-operations.patch
 create mode 100644 recipes-kernel/linux/linux-raspberrypi-vc4/defconfig
 create mode 100644 recipes-kernel/linux/linux-raspberrypi-vc4_4.1.bb

-- 
2.4.3

[meta-raspberrypi][PATCH v2 1/4] rpi-config: Allow to mask GPU irqs

[Javier Martinez Canillas]

From: Derek Foreman <derekf@osg.samsung.com>

The rpi firmware has support for a mask_gpu_interrupt option that can be
defined in the boot/config.txt file. The option makes the VPU not handle
certain interrupts such as V3D. This option is needed by the VC4 DRM/KMS
driver but it is not possible to set it from the meta-raspberrypi layer.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
[javier: Made it a config option]
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

---

Changes in v2:
 - Fix commit message about mask GPU irq option. Suggested by Andrei Gherzan.

 README                                  | 22 ++++++++++++++--------
 recipes-bsp/bootfiles/rpi-config_git.bb |  6 ++++++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/README b/README
index d70f21fe06ed..678c0eb4a4e3 100644
--- a/README
+++ b/README
@@ -20,10 +20,11 @@ Contents:
     2.F. Optional - Video camera support with V4L2 drivers
     2.G. Optional - Enable offline compositing support
     2.H. Optional - Enable kgdb over console support
-    2.I. Images
-    2.J. Boot to U-Boot
-    2.K. Image with Initramfs
-    2.L. Device tree support
+    2.I. Optional - Mask GPU interrupts
+    2.J. Images
+    2.K. Boot to U-Boot
+    2.L. Image with Initramfs
+    2.M. Device tree support
 3. Extra apps
     3.A. omxplayer
 4. Source code and mirrors
@@ -145,7 +146,12 @@ To add the kdbg over console (kgdboc) parameter to the kernel command line,
 set this variable in local.conf:
 ENABLE_KGDB = "1"
 
-2.I. Images
+2.I. Optional - Mask GPU interrupts
+===================================
+To mask the GPU interrupts, set in your local.conf
+MASK_GPU_INTERRUPT = "0x400"
+
+2.J. Images
 ===========
 * rpi-hwup-image
     Hardware up image
@@ -155,7 +161,7 @@ ENABLE_KGDB = "1"
     Image based on rpi-basic-image which includes most of the packages in this
     layer and some media samples.
 
-2.J. Boot to U-Boot
+2.K. Boot to U-Boot
 ===================
 To have u-boot load kernel image, set in your local.conf
 KERNEL_IMAGETYPE = "uImage"
@@ -163,7 +169,7 @@ KERNEL_IMAGETYPE = "uImage"
 This will make kernel.img be u-boot image which will load uImage.
 By default, kernel.img is the actual kernel image (ex. Image).
 
-2.K. Image with Initramfs
+2.L. Image with Initramfs
 =========================
 To build an initramfs image :
     * Set this 3 kernel variables (in linux-raspberrypi.inc for example)
@@ -176,7 +182,7 @@ To build an initramfs image :
     * Set the meta-rasberrypi variable (in raspberrypi.conf for example)
         - KERNEL_INITRAMFS = "-initramfs"
 
-2.L. Device tree support
+2.M. Device tree support
 =========================
 Device tree for RPi is only supported when using linux-raspberrypi 3.18+
 kernels.
diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb
index 29ced342426c..56477a8821bb 100644
--- a/recipes-bsp/bootfiles/rpi-config_git.bb
+++ b/recipes-bsp/bootfiles/rpi-config_git.bb
@@ -66,6 +66,12 @@ do_deploy() {
         echo "# Enable offline compositing" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
         echo "dispmanx_offline=1" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
     fi
+
+    # Mask GPU interrupts
+    if [ -n "${MASK_GPU_INTERRUPT}" ]; then
+        echo "# Mask GPU interrupts" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "mask_gpu_interrupt0=${MASK_GPU_INTERRUPT}" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    fi
 }
 
 addtask deploy before do_package after do_install
-- 
2.4.3

[meta-raspberrypi][PATCH v2 2/4] linux-raspberrypi: Add a 4.1 linux kernel with vc4 support

[Javier Martinez Canillas]

From: Derek Foreman <derekf@osg.samsung.com>

This adds Eric Anholt's WIP kernel with dri/kms/3d support for the GPU on
the rpi2. Adding a recipe that tracks this kernel, will make it easier to
test this setup.

This recipe should only used for testing purposes for now, so it will not
be set as the default but can be chosen by changing the default providers.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
[javier: Extended commit message and set default preference to -1]
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

---

Changes in v2:
- Add a linux-raspberrypi-vc4 recipe insted of a linux-raspberrypi one.
  Suggested by Petter Mabäcker, Andreas Müller and Andrei Gherzan.
- Split the readme change in a separate patch. Suggested by Andrei Gherzan.
- Don't make the vc4 patches inclusion conditional since will always be
  needed when choosing the recipe. Suggested by Andrei Gherzan.

 ..._defconfig-Enable-config-options-for-vc4-.patch |  48 +++++++++
 ...-ARM-dts-Fix-i2c-for-bcm2709-RPI2-B-board.patch |  85 +++++++++++++++
 .../0003-drm-vc4-Use-the-fbdev_cma-helpers.patch   | 115 +++++++++++++++++++++
 .../0004-drm-vc4-Allow-vblank-to-be-disabled.patch |  26 +++++
 .../0005-drm-vc4-Disable-KMS-operations.patch      |  95 +++++++++++++++++
 .../linux/linux-raspberrypi-vc4/defconfig          |   1 +
 recipes-kernel/linux/linux-raspberrypi-vc4_4.1.bb  |  12 +++
 7 files changed, 382 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-raspberrypi-vc4/0001-ARM-bcm2709_defconfig-Enable-config-options-for-vc4-.patch
 create mode 100644 recipes-kernel/linux/linux-raspberrypi-vc4/0002-ARM-dts-Fix-i2c-for-bcm2709-RPI2-B-board.patch
 create mode 100644 recipes-kernel/linux/linux-raspberrypi-vc4/0003-drm-vc4-Use-the-fbdev_cma-helpers.patch
 create mode 100644 recipes-kernel/linux/linux-raspberrypi-vc4/0004-drm-vc4-Allow-vblank-to-be-disabled.patch
 create mode 100644 recipes-kernel/linux/linux-raspberrypi-vc4/0005-drm-vc4-Disable-KMS-operations.patch
 create mode 100644 recipes-kernel/linux/linux-raspberrypi-vc4/defconfig
 create mode 100644 recipes-kernel/linux/linux-raspberrypi-vc4_4.1.bb

diff --git a/recipes-kernel/linux/linux-raspberrypi-vc4/0001-ARM-bcm2709_defconfig-Enable-config-options-for-vc4-.patch b/recipes-kernel/linux/linux-raspberrypi-vc4/0001-ARM-bcm2709_defconfig-Enable-config-options-for-vc4-.patch
new file mode 100644
index 000000000000..1ea62489e077
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi-vc4/0001-ARM-bcm2709_defconfig-Enable-config-options-for-vc4-.patch
@@ -0,0 +1,48 @@
+From 5908700d3cb88114002aa66f920e91961ebe91e4 Mon Sep 17 00:00:00 2001
+From: Derek Foreman <derekf@osg.samsung.com>
+Date: Fri, 24 Jul 2015 01:58:31 +0200
+Subject: [PATCH 1/5] ARM: bcm2709_defconfig: Enable config options for vc4
+ support
+
+Add the needed Kconfig symbols to build Eric Anholt's WIP kernel
+4.1 Linux kernel with vc4 dri/kms/3d support. Also increase CMA
+size from 5 MiB to 256 MiB as that is needed by the driver.
+
+Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
+---
+ arch/arm/configs/bcm2709_defconfig | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
+index a3067bfb610f..7891bb17df57 100644
+--- a/arch/arm/configs/bcm2709_defconfig
++++ b/arch/arm/configs/bcm2709_defconfig
+@@ -39,6 +39,7 @@ CONFIG_MAC_PARTITION=y
+ CONFIG_CFQ_GROUP_IOSCHED=y
+ CONFIG_ARCH_BCM2709=y
+ CONFIG_BCM2709_DT=y
++# CONFIG_VDSO is not set
+ # CONFIG_CACHE_L2X0 is not set
+ CONFIG_SMP=y
+ CONFIG_HAVE_ARM_ARCH_TIMER=y
+@@ -388,7 +389,7 @@ CONFIG_NFC_PN533=m
+ CONFIG_DEVTMPFS=y
+ CONFIG_DEVTMPFS_MOUNT=y
+ CONFIG_DMA_CMA=y
+-CONFIG_CMA_SIZE_MBYTES=5
++CONFIG_CMA_SIZE_MBYTES=256
+ CONFIG_BLK_DEV_LOOP=y
+ CONFIG_BLK_DEV_CRYPTOLOOP=m
+ CONFIG_BLK_DEV_DRBD=m
+@@ -771,6 +772,8 @@ CONFIG_VIDEO_TW9906=m
+ CONFIG_VIDEO_OV7640=m
+ CONFIG_VIDEO_MT9V011=m
+ CONFIG_FB=y
++CONFIG_DRM=y
++CONFIG_DRM_VC4=y
+ CONFIG_FB_BCM2708=y
+ CONFIG_FB_SSD1307=m
+ # CONFIG_BACKLIGHT_GENERIC is not set
+-- 
+2.4.3
+
diff --git a/recipes-kernel/linux/linux-raspberrypi-vc4/0002-ARM-dts-Fix-i2c-for-bcm2709-RPI2-B-board.patch b/recipes-kernel/linux/linux-raspberrypi-vc4/0002-ARM-dts-Fix-i2c-for-bcm2709-RPI2-B-board.patch
new file mode 100644
index 000000000000..acc09760e820
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi-vc4/0002-ARM-dts-Fix-i2c-for-bcm2709-RPI2-B-board.patch
@@ -0,0 +1,85 @@
+From 8882728be24f35f81da4558c84fb18658e23fcc9 Mon Sep 17 00:00:00 2001
+From: Derek Foreman <derekf@osg.samsung.com>
+Date: Wed, 27 May 2015 13:20:21 -0500
+Subject: [PATCH 2/5] ARM: dts: Fix i2c for bcm2709 RPI2 B board
+
+Fix up device tree and i2c setup for rpi2
+
+Signed-off-by: Derek Foreman <derekf@osg.samsung.com
+---
+ arch/arm/boot/dts/bcm2708_common.dtsi | 2 +-
+ arch/arm/boot/dts/bcm2709-rpi-2-b.dts | 6 ++++++
+ drivers/i2c/busses/i2c-bcm2708.c      | 6 +++++-
+ 3 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/boot/dts/bcm2708_common.dtsi b/arch/arm/boot/dts/bcm2708_common.dtsi
+index ccf01a568cb6..15277d2765bb 100644
+--- a/arch/arm/boot/dts/bcm2708_common.dtsi
++++ b/arch/arm/boot/dts/bcm2708_common.dtsi
+@@ -155,7 +155,7 @@
+ 		};
+ 
+ 		i2c2: i2c@7e805000 {
+-			compatible = "brcm,bcm2835-i2c";
++			compatible = "brcm,bcm2708-i2c";
+ 			reg = <0x7e805000 0x1000>;
+ 			interrupts = <2 21>;
+ 			clocks = <&clk_i2c>;
+diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
+index 8aaaf1fb7143..712ca455cc46 100644
+--- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
++++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
+@@ -11,6 +11,7 @@
+ 		spi0 = &spi0;
+ 		i2c0 = &i2c0;
+ 		i2c1 = &i2c1;
++		i2c2 = &i2c2;
+ 		i2s  = &i2s;
+ 		gpio = &gpio;
+ 		intc = &intc;
+@@ -94,6 +95,11 @@
+ 	clock-frequency = <100000>;
+ };
+ 
++&i2c2 {
++	pinctrl-names = "default";
++	clock-frequency = <100000>;
++};
++
+ &i2s {
+ 	#sound-dai-cells = <0>;
+ 	pinctrl-names = "default";
+diff --git a/drivers/i2c/busses/i2c-bcm2708.c b/drivers/i2c/busses/i2c-bcm2708.c
+index 8773203b34eb..2054ff44e744 100644
+--- a/drivers/i2c/busses/i2c-bcm2708.c
++++ b/drivers/i2c/busses/i2c-bcm2708.c
+@@ -109,6 +109,7 @@ static void bcm2708_i2c_init_pinmode(int id)
+ #define SET_GPIO_ALT(g,a) *(gpio+(((g)/10))) |= (((a)<=3?(a)+4:(a)==4?3:2)<<(((g)%10)*3))
+ 
+ 	int pin;
++
+ 	u32 *gpio = ioremap(GPIO_BASE, SZ_16K);
+ 
+ 	BUG_ON(id != 0 && id != 1);
+@@ -382,7 +383,7 @@ static int bcm2708_i2c_probe(struct platform_device *pdev)
+ 		goto out_clk_put;
+ 	}
+ 
+-	if (!pdev->dev.of_node)
++	if (pdev->id < 2)
+ 		bcm2708_i2c_init_pinmode(pdev->id);
+ 
+ 	bi = kzalloc(sizeof(*bi), GFP_KERNEL);
+@@ -407,6 +408,9 @@ static int bcm2708_i2c_probe(struct platform_device *pdev)
+ 	case 1:
+ 		adap->class = I2C_CLASS_DDC;
+ 		break;
++	case 2:
++		adap->class = I2C_CLASS_DDC;
++		break;
+ 	default:
+ 		dev_err(&pdev->dev, "can only bind to BSC 0 or 1\n");
+ 		err = -ENXIO;
+-- 
+2.4.3
+
diff --git a/recipes-kernel/linux/linux-raspberrypi-vc4/0003-drm-vc4-Use-the-fbdev_cma-helpers.patch b/recipes-kernel/linux/linux-raspberrypi-vc4/0003-drm-vc4-Use-the-fbdev_cma-helpers.patch
new file mode 100644
index 000000000000..bc50992dcdbe
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi-vc4/0003-drm-vc4-Use-the-fbdev_cma-helpers.patch
@@ -0,0 +1,115 @@
+From e877e76e5d723eb14bce9c58af40b962eced02bf Mon Sep 17 00:00:00 2001
+From: Derek Foreman <derekf@osg.samsung.com>
+Date: Thu, 2 Jul 2015 11:19:54 -0500
+Subject: [PATCH 3/5] drm/vc4: Use the fbdev_cma helpers
+
+Keep the fbdev_cma pointer around so we can use it on hotplog and close
+to ensure the frame buffer console is in a useful state.
+
+Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
+---
+ drivers/gpu/drm/vc4/vc4_drv.c | 15 +++++++++++++++
+ drivers/gpu/drm/vc4/vc4_drv.h |  2 ++
+ drivers/gpu/drm/vc4/vc4_kms.c | 18 +++++++++++++++---
+ 3 files changed, 32 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
+index 5c023ba4f6ad..04f1f738ebc2 100644
+--- a/drivers/gpu/drm/vc4/vc4_drv.c
++++ b/drivers/gpu/drm/vc4/vc4_drv.c
+@@ -13,6 +13,7 @@
+ #include <linux/module.h>
+ #include <linux/of_platform.h>
+ #include <linux/platform_device.h>
++#include <drm/drm_fb_cma_helper.h>
+ 
+ #include "uapi/drm/vc4_drm.h"
+ #include "vc4_drv.h"
+@@ -78,6 +79,11 @@ vc4_drm_load(struct drm_device *dev, unsigned long flags)
+ 
+ static int vc4_drm_unload(struct drm_device *dev)
+ {
++	struct vc4_dev *vc4 = to_vc4_dev(dev);
++
++	if (vc4->fbdev)
++		drm_fbdev_cma_fini(vc4->fbdev);
++
+ 	drm_mode_config_cleanup(dev);
+ 
+ 	component_unbind_all(dev->dev, dev);
+@@ -93,6 +99,14 @@ static void vc4_drm_preclose(struct drm_device *dev, struct drm_file *file)
+ 		vc4_cancel_page_flip(crtc, file);
+ }
+ 
++static void vc4_lastclose(struct drm_device *dev)
++{
++	struct vc4_dev *vc4 = to_vc4_dev(dev);
++
++	if (vc4->fbdev)
++		drm_fbdev_cma_restore_mode(vc4->fbdev);
++}
++
+ static const struct file_operations vc4_drm_fops = {
+ 	.owner = THIS_MODULE,
+ 	.open = drm_open,
+@@ -123,6 +137,7 @@ static struct drm_driver vc4_drm_driver = {
+ 			    DRIVER_PRIME),
+ 	.load = vc4_drm_load,
+ 	.unload = vc4_drm_unload,
++	.lastclose = vc4_lastclose,
+ 	.set_busid = drm_platform_set_busid,
+ 	.preclose = vc4_drm_preclose,
+ 
+diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
+index 13b475785ca0..d460bb3e6b64 100644
+--- a/drivers/gpu/drm/vc4/vc4_drv.h
++++ b/drivers/gpu/drm/vc4/vc4_drv.h
+@@ -81,6 +81,8 @@ struct vc4_dev {
+ 	} hangcheck;
+ 
+ 	struct semaphore async_modeset;
++
++	struct drm_fbdev_cma *fbdev;
+ };
+ 
+ static inline struct vc4_dev *
+diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
+index acfd1b23ab4a..cb18d8f0e387 100644
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -155,7 +155,17 @@ static int vc4_atomic_commit(struct drm_device *dev,
+ 	return 0;
+ }
+ 
++static void vc4_output_poll_changed(struct drm_device *dev)
++{
++	struct vc4_dev *vc4 = to_vc4_dev(dev);
++
++	if (vc4->fbdev)
++		drm_fbdev_cma_hotplug_event(vc4->fbdev);
++}
++
++
+ static const struct drm_mode_config_funcs vc4_mode_funcs = {
++	.output_poll_changed = vc4_output_poll_changed,
+ 	.atomic_check = drm_atomic_helper_check,
+ 	.atomic_commit = vc4_atomic_commit,
+ 	.fb_create = drm_fb_cma_create,
+@@ -214,9 +224,11 @@ vc4_kms_load(struct drm_device *dev)
+ 
+ 	drm_mode_config_reset(dev);
+ 
+-	drm_fbdev_cma_init(dev, 32,
+-			   dev->mode_config.num_crtc,
+-			   dev->mode_config.num_connector);
++	vc4->fbdev = drm_fbdev_cma_init(dev, 32,
++					dev->mode_config.num_crtc,
++					dev->mode_config.num_connector);
++	if (IS_ERR(vc4->fbdev))
++		vc4->fbdev = NULL;
+ 
+ 	drm_kms_helper_poll_init(dev);
+ 
+-- 
+2.4.3
+
diff --git a/recipes-kernel/linux/linux-raspberrypi-vc4/0004-drm-vc4-Allow-vblank-to-be-disabled.patch b/recipes-kernel/linux/linux-raspberrypi-vc4/0004-drm-vc4-Allow-vblank-to-be-disabled.patch
new file mode 100644
index 000000000000..0293ed713c3e
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi-vc4/0004-drm-vc4-Allow-vblank-to-be-disabled.patch
@@ -0,0 +1,26 @@
+From 4388ed0f2d66399a6ad3133b91bd438cdb25e37b Mon Sep 17 00:00:00 2001
+From: Derek Foreman <derekf@osg.samsung.com>
+Date: Thu, 2 Jul 2015 11:20:21 -0500
+Subject: [PATCH 4/5] drm/vc4: Allow vblank to be disabled
+
+Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
+---
+ drivers/gpu/drm/vc4/vc4_kms.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
+index cb18d8f0e387..1473df9ef4a1 100644
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -218,6 +218,8 @@ vc4_kms_load(struct drm_device *dev)
+ 	dev->mode_config.funcs = &vc4_mode_funcs;
+ 	dev->mode_config.preferred_depth = 24;
+ 
++	dev->vblank_disable_allowed = true;
++
+ 	ret = vc4_init_modeset_objects(dev);
+ 	if (ret)
+ 		goto fail;
+-- 
+2.4.3
+
diff --git a/recipes-kernel/linux/linux-raspberrypi-vc4/0005-drm-vc4-Disable-KMS-operations.patch b/recipes-kernel/linux/linux-raspberrypi-vc4/0005-drm-vc4-Disable-KMS-operations.patch
new file mode 100644
index 000000000000..eff5058aeda7
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi-vc4/0005-drm-vc4-Disable-KMS-operations.patch
@@ -0,0 +1,95 @@
+From 844a32b8444a38b6378c98ad4a4b8b8c3522c020 Mon Sep 17 00:00:00 2001
+From: Derek Foreman <derekf@osg.samsung.com>
+Date: Fri, 24 Jul 2015 03:29:15 +0200
+Subject: [PATCH 5/5] drm/vc4: Disable KMS operations
+
+The vc4 driver KMS implementation still has some issues so
+for now skip most of the codepaths to avoid system hangs.
+
+Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
+---
+ drivers/gpu/drm/drm_atomic_helper.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_crtc.c      | 2 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c      | 6 ++++--
+ drivers/gpu/drm/vc4/vc4_kms.c       | 1 +
+ 4 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
+index 1d2ca52530d5..ba7f355bcced 100644
+--- a/drivers/gpu/drm/drm_atomic_helper.c
++++ b/drivers/gpu/drm/drm_atomic_helper.c
+@@ -1876,7 +1876,7 @@ void drm_atomic_helper_connector_dpms(struct drm_connector *connector,
+ 	struct drm_connector *tmp_connector;
+ 	int ret;
+ 	bool active = false;
+-
++return;
+ 	if (mode != DRM_MODE_DPMS_ON)
+ 		mode = DRM_MODE_DPMS_OFF;
+ 
+diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
+index f9960ac34fd7..1b85355baef0 100644
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -91,7 +91,7 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)
+ 		       ((mode->flags & DRM_MODE_FLAG_INTERLACE) ? 1 : 0));
+ 	u32 format = PV_CONTROL_FORMAT_24;
+ 	bool debug_dump_regs = false;
+-
++return;
+ 	if (debug_dump_regs) {
+ 		DRM_INFO("CRTC %d regs before:\n", drm_crtc_index(crtc));
+ 		vc4_crtc_dump_regs(vc4_crtc);
+diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
+index 8c41fdc4ef2e..2a212b08e108 100644
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -273,7 +273,7 @@ vc4_set_pixel_clock(struct vc4_dev *vc4, u32 clock)
+ {
+ 	u32 packet[2];
+ 	int ret;
+-
++return;
+ 	packet[0] = 8; /* Pixel clock. */
+ 	packet[1] = clock;
+ 
+@@ -295,6 +295,7 @@ static void vc4_hdmi_encoder_mode_set(struct drm_encoder *encoder,
+ 	bool debug_dump_regs = false;
+ 	bool hsync_pos = !(mode->flags & DRM_MODE_FLAG_NHSYNC);
+ 	bool vsync_pos = !(mode->flags & DRM_MODE_FLAG_NVSYNC);
++return;
+ 	u32 vactive = (mode->vdisplay >>
+ 		       ((mode->flags & DRM_MODE_FLAG_INTERLACE) ? 1 : 0));
+ 	u32 verta = (VC4_SET_FIELD(mode->vsync_end - mode->vsync_start,
+@@ -405,7 +406,7 @@ static void vc4_hdmi_encoder_disable(struct drm_encoder *encoder)
+ {
+ 	struct drm_device *dev = encoder->dev;
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
+-
++return;
+ 	HDMI_WRITE(VC4_HDMI_TX_PHY_RESET_CTL, 0xf << 16);
+ }
+ 
+@@ -413,6 +414,7 @@ static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder)
+ {
+ 	struct drm_device *dev = encoder->dev;
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
++return;
+ 
+ 	HDMI_WRITE(VC4_HDMI_TX_PHY_RESET_CTL, 0);
+ }
+diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
+index 1473df9ef4a1..5ddc5d9beaae 100644
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -144,6 +144,7 @@ static int vc4_atomic_commit(struct drm_device *dev,
+ 	 * current layout.
+ 	 */
+ 
++	async=0;
+ 	if (async) {
+ 		vc4_queue_seqno_cb(dev, &c->cb, wait_seqno,
+ 				   vc4_atomic_complete_commit_seqno_cb);
+-- 
+2.4.3
+
diff --git a/recipes-kernel/linux/linux-raspberrypi-vc4/defconfig b/recipes-kernel/linux/linux-raspberrypi-vc4/defconfig
new file mode 100644
index 000000000000..ecbf32cfdc4c
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi-vc4/defconfig
@@ -0,0 +1 @@
+# Dummy file to get through do_kernel_configme.
diff --git a/recipes-kernel/linux/linux-raspberrypi-vc4_4.1.bb b/recipes-kernel/linux/linux-raspberrypi-vc4_4.1.bb
new file mode 100644
index 000000000000..a588102cdb70
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi-vc4_4.1.bb
@@ -0,0 +1,12 @@
+LINUX_VERSION ?= "4.1.0"
+
+SRCREV = "07009cab090ade3dd180e8a55d590b1a00072eed"
+SRC_URI = "git://github.com/anholt/linux.git;protocol=git;branch=vc4-kms-v3d-rpi2 \
+           file://0001-ARM-bcm2709_defconfig-Enable-config-options-for-vc4-.patch \
+           file://0002-ARM-dts-Fix-i2c-for-bcm2709-RPI2-B-board.patch \
+           file://0003-drm-vc4-Use-the-fbdev_cma-helpers.patch \
+           file://0004-drm-vc4-Allow-vblank-to-be-disabled.patch \
+           file://0005-drm-vc4-Disable-KMS-operations.patch \
+          "
+
+require linux-raspberrypi.inc
-- 
2.4.3

[meta-raspberrypi][PATCH v2 3/4] rpi-default-providers: Document how to switch providers for vc4 gfx stack

[Javier Martinez Canillas]

From: Derek Foreman <derekf@osg.samsung.com>

The Raspberry Pi boards can use one of two graphics stacks: The "userland"
user-space driver or the VC4 drm/kms kernel driver. This patch documents
how the user user can choose if the VC4 driver has to be used instead and
set the right preferred providers for that case.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
[javier: Extend commit msg and made conditional instead removing userland]
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

---

Changes in v2:
- Don't add a feature and allow users to change the default provider manually
  aided by a comment. Suggested by Andreas Müller and Andrei Gherzan.

 conf/machine/include/rpi-default-providers.inc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/conf/machine/include/rpi-default-providers.inc b/conf/machine/include/rpi-default-providers.inc
index ee3a3acce7bd..e007bbb60216 100644
--- a/conf/machine/include/rpi-default-providers.inc
+++ b/conf/machine/include/rpi-default-providers.inc
@@ -8,3 +8,13 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "userland"
 PREFERRED_PROVIDER_virtual/libgl ?= "mesa-gl"
 PREFERRED_PROVIDER_virtual/mesa ?= "mesa-gl"
 PREFERRED_PROVIDER_jpeg = "jpeg"
+
+# To use a kernel with the VC4 DRM/KMS driver instead, comment the
+# virtual kernel, egl, libgles2, libgl and mesa preferred provider
+# above and uncomment the following lines.
+#
+# PREFERRED_PROVIDER_virtual/kernel = "linux-raspberrypi-vc4"
+# PREFERRED_PROVIDER_virtual/egl ?= "mesa"
+# PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
+# PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
+# PREFERRED_PROVIDER_virtual/mesa ?= "mesa"
-- 
2.4.3

[meta-raspberrypi][PATCH v2 4/4] README: Add a section about graphic stacks

[Javier Martinez Canillas]

This patch adds to the README a section that explains the RPi can different
graphics stacks and that the user can choose by manually changing providers.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

---

Changes in v2: None

 README | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README b/README
index 678c0eb4a4e3..0569b353870c 100644
--- a/README
+++ b/README
@@ -25,6 +25,7 @@ Contents:
     2.K. Boot to U-Boot
     2.L. Image with Initramfs
     2.M. Device tree support
+    2.O. Graphic stacks
 3. Extra apps
     3.A. omxplayer
 4. Source code and mirrors
@@ -195,6 +196,14 @@ kernels.
 NOTE: KERNEL_DEVICETREE is default enabled for kernel >= 3.18 and always disabled for
       older kernel versions.
 
+2.O. Graphic stacks
+===================
+The Raspberry Pi boards can use one of two graphics stacks: The userland
+user-space driver or the vc4 DRM/KMS kernel driver. By default userland
+is used since the vc4 is still experimental. But this can be changed by
+modifying the defaults for the kernel, egl, gles2, libgl and mesa providers.
+This is explained in the conf/machine/include/rpi-default-providers.inc file.
+
 3. Extra apps
 =============
 
-- 
2.4.3

Re: [meta-raspberrypi][PATCH v2 4/4] README: Add a section about graphic stacks

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1545 bytes --]


> On Aug 13, 2015, at 10:07 AM, Javier Martinez Canillas <javier@osg.samsung.com> wrote:
> 
> This patch adds to the README a section that explains the RPi can different
> graphics stacks and that the user can choose by manually changing providers.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> 
> ---
> 
> Changes in v2: None
> 
> README | 9 +++++++++
> 1 file changed, 9 insertions(+)
> 
> diff --git a/README b/README
> index 678c0eb4a4e3..0569b353870c 100644
> --- a/README
> +++ b/README
> @@ -25,6 +25,7 @@ Contents:
>     2.K. Boot to U-Boot
>     2.L. Image with Initramfs
>     2.M. Device tree support
> +    2.O. Graphic stacks
> 3. Extra apps
>     3.A. omxplayer
> 4. Source code and mirrors
> @@ -195,6 +196,14 @@ kernels.
> NOTE: KERNEL_DEVICETREE is default enabled for kernel >= 3.18 and always disabled for
>       older kernel versions.
> 
> +2.O. Graphic stacks
> +===================
> +The Raspberry Pi boards can use one of two graphics stacks: The userland
> +user-space driver or the vc4 DRM/KMS kernel driver. By default userland
> +is used since the vc4 is still experimental. But this can be changed by
> +modifying the defaults for the kernel, egl, gles2, libgl and mesa providers.
> +This is explained in the conf/machine/include/rpi-default-providers.inc file.
> +

you may want to add pointer to the commented out code that you have added to select them
in rpi-default-providers.inc

> 3. Extra apps
> =============
> 
> --
> 2.4.3
> 


[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

Re: [meta-raspberrypi][PATCH v2 4/4] README: Add a section about graphic stacks

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 1848 bytes --]

Hello,

On Thursday, August 13, 2015, Khem Raj <raj.khem@gmail.com> wrote:

>
> > On Aug 13, 2015, at 10:07 AM, Javier Martinez Canillas <
> javier@osg.samsung.com <javascript:;>> wrote:
> >
> > This patch adds to the README a section that explains the RPi can
> different
> > graphics stacks and that the user can choose by manually changing
> providers.
> >
> > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com
> <javascript:;>>
> >
> > ---
> >
> > Changes in v2: None
> >
> > README | 9 +++++++++
> > 1 file changed, 9 insertions(+)
> >
> > diff --git a/README b/README
> > index 678c0eb4a4e3..0569b353870c 100644
> > --- a/README
> > +++ b/README
> > @@ -25,6 +25,7 @@ Contents:
> >     2.K. Boot to U-Boot
> >     2.L. Image with Initramfs
> >     2.M. Device tree support
> > +    2.O. Graphic stacks
> > 3. Extra apps
> >     3.A. omxplayer
> > 4. Source code and mirrors
> > @@ -195,6 +196,14 @@ kernels.
> > NOTE: KERNEL_DEVICETREE is default enabled for kernel >= 3.18 and always
> disabled for
> >       older kernel versions.
> >
> > +2.O. Graphic stacks
> > +===================
> > +The Raspberry Pi boards can use one of two graphics stacks: The userland
> > +user-space driver or the vc4 DRM/KMS kernel driver. By default userland
> > +is used since the vc4 is still experimental. But this can be changed by
> > +modifying the defaults for the kernel, egl, gles2, libgl and mesa
> providers.
> > +This is explained in the conf/machine/include/rpi-default-providers.inc
> file.
> > +
>
> you may want to add pointer to the commented out code that you have added
> to select them
> in rpi-default-providers.inc
>

It would be nice to have some detailed info on what and where to comment
out the configuration.

--
Andrei Gherzan


-- 
--
Andrei Gherzan

[-- Attachment #2: Type: text/html, Size: 2506 bytes --]

Re: [meta-raspberrypi][PATCH v2 4/4] README: Add a section about graphic stacks

[Javier Martinez Canillas]

Hello Andrei and Khem,

Thanks a lot for your feedback.

On 08/17/2015 09:57 AM, Andrei Gherzan wrote:
> Hello,
> 
> On Thursday, August 13, 2015, Khem Raj <raj.khem@gmail.com> wrote:
> 
>>
>>> On Aug 13, 2015, at 10:07 AM, Javier Martinez Canillas <
>> javier@osg.samsung.com <javascript:;>> wrote:
>>>
>>> This patch adds to the README a section that explains the RPi can
>> different
>>> graphics stacks and that the user can choose by manually changing
>> providers.
>>>
>>> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com
>> <javascript:;>>
>>>
>>> ---
>>>
>>> Changes in v2: None
>>>
>>> README | 9 +++++++++
>>> 1 file changed, 9 insertions(+)
>>>
>>> diff --git a/README b/README
>>> index 678c0eb4a4e3..0569b353870c 100644
>>> --- a/README
>>> +++ b/README
>>> @@ -25,6 +25,7 @@ Contents:
>>>     2.K. Boot to U-Boot
>>>     2.L. Image with Initramfs
>>>     2.M. Device tree support
>>> +    2.O. Graphic stacks
>>> 3. Extra apps
>>>     3.A. omxplayer
>>> 4. Source code and mirrors
>>> @@ -195,6 +196,14 @@ kernels.
>>> NOTE: KERNEL_DEVICETREE is default enabled for kernel >= 3.18 and always
>> disabled for
>>>       older kernel versions.
>>>
>>> +2.O. Graphic stacks
>>> +===================
>>> +The Raspberry Pi boards can use one of two graphics stacks: The userland
>>> +user-space driver or the vc4 DRM/KMS kernel driver. By default userland
>>> +is used since the vc4 is still experimental. But this can be changed by
>>> +modifying the defaults for the kernel, egl, gles2, libgl and mesa
>> providers.
>>> +This is explained in the conf/machine/include/rpi-default-providers.inc
>> file.
>>> +
>>
>> you may want to add pointer to the commented out code that you have added
>> to select them
>> in rpi-default-providers.inc
>>
> 
> It would be nice to have some detailed info on what and where to comment
> out the configuration.
>

On patch 3/4 I added that documentation to rpi-default-providers but didn't
add it to the README and instead pointed out to rpi-default-providers to
have a level of indirection in case the providers change and to not have
duplicated information but I will add it to the README as well.

Do you have comments on the other patches in the series so I can address
all of them before re-spinning?

> --
> Andrei Gherzan
> 
> 

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America

Re: [meta-raspberrypi][PATCH v2 4/4] README: Add a section about graphic stacks

[Javier Martinez Canillas]

Hello,

On 08/17/2015 11:58 AM, Javier Martinez Canillas wrote:
> On 08/17/2015 09:57 AM, Andrei Gherzan wrote:
>> On Thursday, August 13, 2015, Khem Raj <raj.khem@gmail.com> wrote:

[snip]

>>>>
>>>> +2.O. Graphic stacks
>>>> +===================
>>>> +The Raspberry Pi boards can use one of two graphics stacks: The userland
>>>> +user-space driver or the vc4 DRM/KMS kernel driver. By default userland
>>>> +is used since the vc4 is still experimental. But this can be changed by
>>>> +modifying the defaults for the kernel, egl, gles2, libgl and mesa
>>> providers.
>>>> +This is explained in the conf/machine/include/rpi-default-providers.inc
>>> file.
>>>> +
>>>
>>> you may want to add pointer to the commented out code that you have added
>>> to select them
>>> in rpi-default-providers.inc
>>>
>>
>> It would be nice to have some detailed info on what and where to comment
>> out the configuration.
>>
> 
> On patch 3/4 I added that documentation to rpi-default-providers but didn't
> add it to the README and instead pointed out to rpi-default-providers to
> have a level of indirection in case the providers change and to not have
> duplicated information but I will add it to the README as well.
> 
> Do you have comments on the other patches in the series so I can address
> all of them before re-spinning?
> 

Gentle ping about this. Thanks!

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America

Re: [meta-raspberrypi][PATCH v2 4/4] README: Add a section about graphic stacks

[Andrei Gherzan]

Hello Javier,

On Mon, Aug 24, 2015 at 10:25:30PM +0200, Javier Martinez Canillas wrote:
> Hello,
>
> On 08/17/2015 11:58 AM, Javier Martinez Canillas wrote:
> > On 08/17/2015 09:57 AM, Andrei Gherzan wrote:
> >> On Thursday, August 13, 2015, Khem Raj <raj.khem@gmail.com> wrote:
>
> [snip]
>
> >>>>
> >>>> +2.O. Graphic stacks
> >>>> +===================
> >>>> +The Raspberry Pi boards can use one of two graphics stacks: The userland
> >>>> +user-space driver or the vc4 DRM/KMS kernel driver. By default userland
> >>>> +is used since the vc4 is still experimental. But this can be changed by
> >>>> +modifying the defaults for the kernel, egl, gles2, libgl and mesa
> >>> providers.
> >>>> +This is explained in the conf/machine/include/rpi-default-providers.inc
> >>> file.
> >>>> +
> >>>
> >>> you may want to add pointer to the commented out code that you have added
> >>> to select them
> >>> in rpi-default-providers.inc
> >>>
> >>
> >> It would be nice to have some detailed info on what and where to comment
> >> out the configuration.
> >>
> >
> > On patch 3/4 I added that documentation to rpi-default-providers but didn't
> > add it to the README and instead pointed out to rpi-default-providers to
> > have a level of indirection in case the providers change and to not have
> > duplicated information but I will add it to the README as well.
> >
> > Do you have comments on the other patches in the series so I can address
> > all of them before re-spinning?
> >
>

Really sorry on this late reply. So my only recommendation is to move things
you wrote in 3/4 in the 4/4 (README). Basically you would describe what a user
needs to overwrite as providers in order to use VC4 as graphics stack.

As well, how do you handle the devicetrees for 4.1? Aren't changed in 4+?

> Gentle ping about this. Thanks!
>
> Best regards,
> --
> Javier Martinez Canillas
> Open Source Group
> Samsung Research America

--
Andrei Gherzan

Re: [meta-raspberrypi][PATCH v2 4/4] README: Add a section about graphic stacks

[Javier Martinez Canillas]

Hello Andrei,

On 10/21/2015 02:32 PM, Andrei Gherzan wrote:
> Hello Javier,
> 
> On Mon, Aug 24, 2015 at 10:25:30PM +0200, Javier Martinez Canillas wrote:
>> Hello,
>>
>> On 08/17/2015 11:58 AM, Javier Martinez Canillas wrote:
>>> On 08/17/2015 09:57 AM, Andrei Gherzan wrote:
>>>> On Thursday, August 13, 2015, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> [snip]
>>
>>>>>>
>>>>>> +2.O. Graphic stacks
>>>>>> +===================
>>>>>> +The Raspberry Pi boards can use one of two graphics stacks: The userland
>>>>>> +user-space driver or the vc4 DRM/KMS kernel driver. By default userland
>>>>>> +is used since the vc4 is still experimental. But this can be changed by
>>>>>> +modifying the defaults for the kernel, egl, gles2, libgl and mesa
>>>>> providers.
>>>>>> +This is explained in the conf/machine/include/rpi-default-providers.inc
>>>>> file.
>>>>>> +
>>>>>
>>>>> you may want to add pointer to the commented out code that you have added
>>>>> to select them
>>>>> in rpi-default-providers.inc
>>>>>
>>>>
>>>> It would be nice to have some detailed info on what and where to comment
>>>> out the configuration.
>>>>
>>>
>>> On patch 3/4 I added that documentation to rpi-default-providers but didn't
>>> add it to the README and instead pointed out to rpi-default-providers to
>>> have a level of indirection in case the providers change and to not have
>>> duplicated information but I will add it to the README as well.
>>>
>>> Do you have comments on the other patches in the series so I can address
>>> all of them before re-spinning?
>>>
>>
> 
> Really sorry on this late reply. So my only recommendation is to move things

No worries, I've also been very busy with other stuff.

> you wrote in 3/4 in the 4/4 (README). Basically you would describe what a user
> needs to overwrite as providers in order to use VC4 as graphics stack.
>

Ok, I'm traveling to Korea next week for KLF and KS so I'll probably resend
a v3 (addressing your suggestions) later next week when I'm back.
 
> As well, how do you handle the devicetrees for 4.1? Aren't changed in 4+?
>

For now, I'm defining a KERNEL_DEVICETREE in my conf/local.conf file since
that is what was agreed with Petter Mabäcker on v1 of this series [0 and
I also mentioned in the cover letter [1].

But the new device tree overlay dir layout is not only for 4+ but also it
is used in the latest version of the older branches. So once all recipes'
SRCREV are bumped, overwriting the variable won't be necessary anymore.

>> Gentle ping about this. Thanks!
>>
>> Best regards,
>> --
>> Javier Martinez Canillas
>> Open Source Group
>> Samsung Research America
> 
> --
> Andrei Gherzan
> 

[0]: https://lists.yoctoproject.org/pipermail/yocto/2015-August/025961.html
[1]: https://lists.yoctoproject.org/pipermail/yocto/2015-August/026151.html

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America

Re: [meta-raspberrypi][PATCH v2 4/4] README: Add a section about graphic stacks

[Andreas Müller]

On Wed, Oct 21, 2015 at 3:48 PM, Javier Martinez Canillas
<javier@osg.samsung.com> wrote:
> Hello Andrei,
>
> On 10/21/2015 02:32 PM, Andrei Gherzan wrote:
>> Hello Javier,
>>
>> On Mon, Aug 24, 2015 at 10:25:30PM +0200, Javier Martinez Canillas wrote:
>>> Hello,
>>>
>>> On 08/17/2015 11:58 AM, Javier Martinez Canillas wrote:
>>>> On 08/17/2015 09:57 AM, Andrei Gherzan wrote:
>>>>> On Thursday, August 13, 2015, Khem Raj <raj.khem@gmail.com> wrote:
>>>
>>> [snip]
>>>
>>>>>>>
>>>>>>> +2.O. Graphic stacks
>>>>>>> +===================
>>>>>>> +The Raspberry Pi boards can use one of two graphics stacks: The userland
>>>>>>> +user-space driver or the vc4 DRM/KMS kernel driver. By default userland
>>>>>>> +is used since the vc4 is still experimental. But this can be changed by
>>>>>>> +modifying the defaults for the kernel, egl, gles2, libgl and mesa
>>>>>> providers.
>>>>>>> +This is explained in the conf/machine/include/rpi-default-providers.inc
>>>>>> file.
>>>>>>> +
>>>>>>
>>>>>> you may want to add pointer to the commented out code that you have added
>>>>>> to select them
>>>>>> in rpi-default-providers.inc
>>>>>>
>>>>>
>>>>> It would be nice to have some detailed info on what and where to comment
>>>>> out the configuration.
>>>>>
>>>>
>>>> On patch 3/4 I added that documentation to rpi-default-providers but didn't
>>>> add it to the README and instead pointed out to rpi-default-providers to
>>>> have a level of indirection in case the providers change and to not have
>>>> duplicated information but I will add it to the README as well.
>>>>
>>>> Do you have comments on the other patches in the series so I can address
>>>> all of them before re-spinning?
>>>>
>>>
>>
>> Really sorry on this late reply. So my only recommendation is to move things
>
> No worries, I've also been very busy with other stuff.
>
>> you wrote in 3/4 in the 4/4 (README). Basically you would describe what a user
>> needs to overwrite as providers in order to use VC4 as graphics stack.
>>
>
> Ok, I'm traveling to Korea next week for KLF and KS so I'll probably resend
> a v3 (addressing your suggestions) later next week when I'm back.
>
>> As well, how do you handle the devicetrees for 4.1? Aren't changed in 4+?
>>
>
> For now, I'm defining a KERNEL_DEVICETREE in my conf/local.conf file since
> that is what was agreed with Petter Mabäcker on v1 of this series [0 and
> I also mentioned in the cover letter [1].
>
> But the new device tree overlay dir layout is not only for 4+ but also it
> is used in the latest version of the older branches. So once all recipes'
> SRCREV are bumped, overwriting the variable won't be necessary anymore.
>
>>> Gentle ping about this. Thanks!
>>>
>>> Best regards,
>>> --
>>> Javier Martinez Canillas
>>> Open Source Group
>>> Samsung Research America
>>
>> --
>> Andrei Gherzan
>>
>
> [0]: https://lists.yoctoproject.org/pipermail/yocto/2015-August/025961.html
> [1]: https://lists.yoctoproject.org/pipermail/yocto/2015-August/026151.html
>
> Best regards,
> --
> Javier Martinez Canillas
> Open Source Group
> Samsung Research America
When reworking: If I am not mistaken there is a chance that
modesetting will work when using latest kernel versions from Eric
Anholt. So would you mind to rebase the patches to these changes? I
would again play tester role.

Andreas

Re: [meta-raspberrypi][PATCH v2 4/4] README: Add a section about graphic stacks

[Javier Martinez Canillas]

Hello Andreas,

On 10/21/2015 04:55 PM, Andreas Müller wrote:
> On Wed, Oct 21, 2015 at 3:48 PM, Javier Martinez Canillas
> <javier@osg.samsung.com> wrote:
>> Hello Andrei,
>>
>> On 10/21/2015 02:32 PM, Andrei Gherzan wrote:
>>> Hello Javier,
>>>
>>> On Mon, Aug 24, 2015 at 10:25:30PM +0200, Javier Martinez Canillas wrote:
>>>> Hello,
>>>>
>>>> On 08/17/2015 11:58 AM, Javier Martinez Canillas wrote:
>>>>> On 08/17/2015 09:57 AM, Andrei Gherzan wrote:
>>>>>> On Thursday, August 13, 2015, Khem Raj <raj.khem@gmail.com> wrote:
>>>>
>>>> [snip]
>>>>
>>>>>>>>
>>>>>>>> +2.O. Graphic stacks
>>>>>>>> +===================
>>>>>>>> +The Raspberry Pi boards can use one of two graphics stacks: The userland
>>>>>>>> +user-space driver or the vc4 DRM/KMS kernel driver. By default userland
>>>>>>>> +is used since the vc4 is still experimental. But this can be changed by
>>>>>>>> +modifying the defaults for the kernel, egl, gles2, libgl and mesa
>>>>>>> providers.
>>>>>>>> +This is explained in the conf/machine/include/rpi-default-providers.inc
>>>>>>> file.
>>>>>>>> +
>>>>>>>
>>>>>>> you may want to add pointer to the commented out code that you have added
>>>>>>> to select them
>>>>>>> in rpi-default-providers.inc
>>>>>>>
>>>>>>
>>>>>> It would be nice to have some detailed info on what and where to comment
>>>>>> out the configuration.
>>>>>>
>>>>>
>>>>> On patch 3/4 I added that documentation to rpi-default-providers but didn't
>>>>> add it to the README and instead pointed out to rpi-default-providers to
>>>>> have a level of indirection in case the providers change and to not have
>>>>> duplicated information but I will add it to the README as well.
>>>>>
>>>>> Do you have comments on the other patches in the series so I can address
>>>>> all of them before re-spinning?
>>>>>
>>>>
>>>
>>> Really sorry on this late reply. So my only recommendation is to move things
>>
>> No worries, I've also been very busy with other stuff.
>>
>>> you wrote in 3/4 in the 4/4 (README). Basically you would describe what a user
>>> needs to overwrite as providers in order to use VC4 as graphics stack.
>>>
>>
>> Ok, I'm traveling to Korea next week for KLF and KS so I'll probably resend
>> a v3 (addressing your suggestions) later next week when I'm back.
>>
>>> As well, how do you handle the devicetrees for 4.1? Aren't changed in 4+?
>>>
>>
>> For now, I'm defining a KERNEL_DEVICETREE in my conf/local.conf file since
>> that is what was agreed with Petter Mabäcker on v1 of this series [0 and
>> I also mentioned in the cover letter [1].
>>
>> But the new device tree overlay dir layout is not only for 4+ but also it
>> is used in the latest version of the older branches. So once all recipes'
>> SRCREV are bumped, overwriting the variable won't be necessary anymore.
>>
>>>> Gentle ping about this. Thanks!
>>>>
>>>> Best regards,
>>>> --
>>>> Javier Martinez Canillas
>>>> Open Source Group
>>>> Samsung Research America
>>>
>>> --
>>> Andrei Gherzan
>>>
>>
>> [0]: https://lists.yoctoproject.org/pipermail/yocto/2015-August/025961.html
>> [1]: https://lists.yoctoproject.org/pipermail/yocto/2015-August/026151.html
>>
>> Best regards,
>> --
>> Javier Martinez Canillas
>> Open Source Group
>> Samsung Research America
> When reworking: If I am not mistaken there is a chance that
> modesetting will work when using latest kernel versions from Eric
> Anholt. So would you mind to rebase the patches to these changes? I
> would again play tester role.
>

Yes, I will. I know Derek was also playing with Eric's latest branch
so I'll coordinate with him and bump the sha-1 id if necessary.
 
> Andreas
> 

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America

Re: [meta-raspberrypi][PATCH v2 4/4] README: Add a section about graphic stacks

[Andrei Gherzan]

On Wed, Oct 21, 2015 at 5:02 PM, Javier Martinez Canillas
<javier@osg.samsung.com> wrote:
> Hello Andreas,
>
> On 10/21/2015 04:55 PM, Andreas Müller wrote:
>> On Wed, Oct 21, 2015 at 3:48 PM, Javier Martinez Canillas
>> <javier@osg.samsung.com> wrote:
>>> Hello Andrei,
>>>
>>> On 10/21/2015 02:32 PM, Andrei Gherzan wrote:
>>>> Hello Javier,
>>>>
>>>> On Mon, Aug 24, 2015 at 10:25:30PM +0200, Javier Martinez Canillas wrote:
>>>>> Hello,
>>>>>
>>>>> On 08/17/2015 11:58 AM, Javier Martinez Canillas wrote:
>>>>>> On 08/17/2015 09:57 AM, Andrei Gherzan wrote:
>>>>>>> On Thursday, August 13, 2015, Khem Raj <raj.khem@gmail.com> wrote:
>>>>>
>>>>> [snip]
>>>>>
>>>>>>>>>
>>>>>>>>> +2.O. Graphic stacks
>>>>>>>>> +===================
>>>>>>>>> +The Raspberry Pi boards can use one of two graphics stacks: The userland
>>>>>>>>> +user-space driver or the vc4 DRM/KMS kernel driver. By default userland
>>>>>>>>> +is used since the vc4 is still experimental. But this can be changed by
>>>>>>>>> +modifying the defaults for the kernel, egl, gles2, libgl and mesa
>>>>>>>> providers.
>>>>>>>>> +This is explained in the conf/machine/include/rpi-default-providers.inc
>>>>>>>> file.
>>>>>>>>> +
>>>>>>>>
>>>>>>>> you may want to add pointer to the commented out code that you have added
>>>>>>>> to select them
>>>>>>>> in rpi-default-providers.inc
>>>>>>>>
>>>>>>>
>>>>>>> It would be nice to have some detailed info on what and where to comment
>>>>>>> out the configuration.
>>>>>>>
>>>>>>
>>>>>> On patch 3/4 I added that documentation to rpi-default-providers but didn't
>>>>>> add it to the README and instead pointed out to rpi-default-providers to
>>>>>> have a level of indirection in case the providers change and to not have
>>>>>> duplicated information but I will add it to the README as well.
>>>>>>
>>>>>> Do you have comments on the other patches in the series so I can address
>>>>>> all of them before re-spinning?
>>>>>>
>>>>>
>>>>
>>>> Really sorry on this late reply. So my only recommendation is to move things
>>>
>>> No worries, I've also been very busy with other stuff.
>>>
>>>> you wrote in 3/4 in the 4/4 (README). Basically you would describe what a user
>>>> needs to overwrite as providers in order to use VC4 as graphics stack.
>>>>
>>>
>>> Ok, I'm traveling to Korea next week for KLF and KS so I'll probably resend
>>> a v3 (addressing your suggestions) later next week when I'm back.
>>>
>>>> As well, how do you handle the devicetrees for 4.1? Aren't changed in 4+?
>>>>
>>>
>>> For now, I'm defining a KERNEL_DEVICETREE in my conf/local.conf file since
>>> that is what was agreed with Petter Mabäcker on v1 of this series [0 and
>>> I also mentioned in the cover letter [1].
>>>
>>> But the new device tree overlay dir layout is not only for 4+ but also it
>>> is used in the latest version of the older branches. So once all recipes'
>>> SRCREV are bumped, overwriting the variable won't be necessary anymore.
>>>
>>>>> Gentle ping about this. Thanks!
>>>>>
>>>>> Best regards,
>>>>> --
>>>>> Javier Martinez Canillas
>>>>> Open Source Group
>>>>> Samsung Research America
>>>>
>>>> --
>>>> Andrei Gherzan
>>>>
>>>
>>> [0]: https://lists.yoctoproject.org/pipermail/yocto/2015-August/025961.html
>>> [1]: https://lists.yoctoproject.org/pipermail/yocto/2015-August/026151.html
>>>
>>> Best regards,
>>> --
>>> Javier Martinez Canillas
>>> Open Source Group
>>> Samsung Research America
>> When reworking: If I am not mistaken there is a chance that
>> modesetting will work when using latest kernel versions from Eric
>> Anholt. So would you mind to rebase the patches to these changes? I
>> would again play tester role.
>>
>
> Yes, I will. I know Derek was also playing with Eric's latest branch
> so I'll coordinate with him and bump the sha-1 id if necessary.
>

In the meanwhile I will add 4.X support. Finally?

--
Andrei Gherzan

Re: [meta-raspberrypi][PATCH v2 4/4] README: Add a section about graphic stacks

[Andrei Gherzan]

On Wed, Oct 21, 2015 at 05:47:55PM +0200, Andrei Gherzan wrote:
> On Wed, Oct 21, 2015 at 5:02 PM, Javier Martinez Canillas
> <javier@osg.samsung.com> wrote:
> > Hello Andreas,
> >
> > On 10/21/2015 04:55 PM, Andreas Müller wrote:
> >> On Wed, Oct 21, 2015 at 3:48 PM, Javier Martinez Canillas
> >> <javier@osg.samsung.com> wrote:
> >>> Hello Andrei,
> >>>
> >>> On 10/21/2015 02:32 PM, Andrei Gherzan wrote:
> >>>> Hello Javier,
> >>>>
> >>>> On Mon, Aug 24, 2015 at 10:25:30PM +0200, Javier Martinez Canillas wrote:
> >>>>> Hello,
> >>>>>
> >>>>> On 08/17/2015 11:58 AM, Javier Martinez Canillas wrote:
> >>>>>> On 08/17/2015 09:57 AM, Andrei Gherzan wrote:
> >>>>>>> On Thursday, August 13, 2015, Khem Raj <raj.khem@gmail.com> wrote:
> >>>>>
> >>>>> [snip]
> >>>>>
> >>>>>>>>>
> >>>>>>>>> +2.O. Graphic stacks
> >>>>>>>>> +===================
> >>>>>>>>> +The Raspberry Pi boards can use one of two graphics stacks: The userland
> >>>>>>>>> +user-space driver or the vc4 DRM/KMS kernel driver. By default userland
> >>>>>>>>> +is used since the vc4 is still experimental. But this can be changed by
> >>>>>>>>> +modifying the defaults for the kernel, egl, gles2, libgl and mesa
> >>>>>>>> providers.
> >>>>>>>>> +This is explained in the conf/machine/include/rpi-default-providers.inc
> >>>>>>>> file.
> >>>>>>>>> +
> >>>>>>>>
> >>>>>>>> you may want to add pointer to the commented out code that you have added
> >>>>>>>> to select them
> >>>>>>>> in rpi-default-providers.inc
> >>>>>>>>
> >>>>>>>
> >>>>>>> It would be nice to have some detailed info on what and where to comment
> >>>>>>> out the configuration.
> >>>>>>>
> >>>>>>
> >>>>>> On patch 3/4 I added that documentation to rpi-default-providers but didn't
> >>>>>> add it to the README and instead pointed out to rpi-default-providers to
> >>>>>> have a level of indirection in case the providers change and to not have
> >>>>>> duplicated information but I will add it to the README as well.
> >>>>>>
> >>>>>> Do you have comments on the other patches in the series so I can address
> >>>>>> all of them before re-spinning?
> >>>>>>
> >>>>>
> >>>>
> >>>> Really sorry on this late reply. So my only recommendation is to move things
> >>>
> >>> No worries, I've also been very busy with other stuff.
> >>>
> >>>> you wrote in 3/4 in the 4/4 (README). Basically you would describe what a user
> >>>> needs to overwrite as providers in order to use VC4 as graphics stack.
> >>>>
> >>>
> >>> Ok, I'm traveling to Korea next week for KLF and KS so I'll probably resend
> >>> a v3 (addressing your suggestions) later next week when I'm back.
> >>>
> >>>> As well, how do you handle the devicetrees for 4.1? Aren't changed in 4+?
> >>>>
> >>>
> >>> For now, I'm defining a KERNEL_DEVICETREE in my conf/local.conf file since
> >>> that is what was agreed with Petter Mabäcker on v1 of this series [0 and
> >>> I also mentioned in the cover letter [1].
> >>>
> >>> But the new device tree overlay dir layout is not only for 4+ but also it
> >>> is used in the latest version of the older branches. So once all recipes'
> >>> SRCREV are bumped, overwriting the variable won't be necessary anymore.
> >>>
> >>>>> Gentle ping about this. Thanks!
> >>>>>
> >>>>> Best regards,
> >>>>> --
> >>>>> Javier Martinez Canillas
> >>>>> Open Source Group
> >>>>> Samsung Research America
> >>>>
> >>>> --
> >>>> Andrei Gherzan
> >>>>
> >>>
> >>> [0]: https://lists.yoctoproject.org/pipermail/yocto/2015-August/025961.html
> >>> [1]: https://lists.yoctoproject.org/pipermail/yocto/2015-August/026151.html
> >>>
> >>> Best regards,
> >>> --
> >>> Javier Martinez Canillas
> >>> Open Source Group
> >>> Samsung Research America
> >> When reworking: If I am not mistaken there is a chance that
> >> modesetting will work when using latest kernel versions from Eric
> >> Anholt. So would you mind to rebase the patches to these changes? I
> >> would again play tester role.
> >>
> >
> > Yes, I will. I know Derek was also playing with Eric's latest branch
> > so I'll coordinate with him and bump the sha-1 id if necessary.
> >
>
> In the meanwhile I will add 4.X support. Finally?
>
> --
> Andrei Gherzan

Done. Waiting for the next patch set of VC4. Thanks.

--
Andrei Gherzan