aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.4/0103-squash-fixups.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-17 10:42:23 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-17 10:42:23 +0000
commit4224b52c3acc7203e7c2535d6806f30432dae5e3 (patch)
tree7a847d3e84dfc3608555587c3b9958474fc17d72 /target/linux/brcm2708/patches-4.4/0103-squash-fixups.patch
parentcad399c87b7739c4b8eeb4119706860818f7d84f (diff)
downloadupstream-4224b52c3acc7203e7c2535d6806f30432dae5e3.tar.gz
upstream-4224b52c3acc7203e7c2535d6806f30432dae5e3.tar.bz2
upstream-4224b52c3acc7203e7c2535d6806f30432dae5e3.zip
brcm2708: add linux 4.4 support
- random-bcm2708 and spi-bcm2708 have been removed. - sound-soc-bcm2708-i2s has been upstreamed as sound-soc-bcm2835-i2s. Let's keep linux 4.1 for a while, since linux 4.4 appears to have some issues with multicast traffic on RPi ethernet: https://gist.github.com/Noltari/5b1cfdecce5ed4bc08fd Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> SVN-Revision: 48266
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0103-squash-fixups.patch')
-rw-r--r--target/linux/brcm2708/patches-4.4/0103-squash-fixups.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0103-squash-fixups.patch b/target/linux/brcm2708/patches-4.4/0103-squash-fixups.patch
new file mode 100644
index 0000000000..cd21a7e77e
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.4/0103-squash-fixups.patch
@@ -0,0 +1,43 @@
+From 88f275f67c6816cad5aec510074bacea409d78cd Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Wed, 18 Nov 2015 18:29:58 +0000
+Subject: [PATCH 103/127] squash: fixups
+
+---
+ drivers/gpu/drm/vc4/Kconfig | 2 +-
+ drivers/gpu/drm/vc4/vc4_drv.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_kms.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/Kconfig
++++ b/drivers/gpu/drm/vc4/Kconfig
+@@ -1,6 +1,6 @@
+ config DRM_VC4
+ tristate "Broadcom VC4 Graphics"
+- depends on ARCH_BCM2835 || COMPILE_TEST
++ depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709 || COMPILE_TEST
+ depends on DRM && HAVE_DMA_ATTRS
+ select DRM_KMS_HELPER
+ select DRM_KMS_CMA_HELPER
+--- a/drivers/gpu/drm/vc4/vc4_drv.c
++++ b/drivers/gpu/drm/vc4/vc4_drv.c
+@@ -127,7 +127,7 @@ static struct drm_driver vc4_drm_driver
+ .num_ioctls = ARRAY_SIZE(vc4_drm_ioctls),
+ .fops = &vc4_drm_fops,
+
+- .gem_obj_size = sizeof(struct vc4_bo),
++ //.gem_obj_size = sizeof(struct vc4_bo),
+
+ .name = DRIVER_NAME,
+ .desc = DRIVER_DESC,
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -45,7 +45,7 @@ vc4_atomic_complete_commit(struct vc4_co
+
+ drm_atomic_helper_commit_modeset_disables(dev, state);
+
+- drm_atomic_helper_commit_planes(dev, state);
++ drm_atomic_helper_commit_planes(dev, state, false);
+
+ drm_atomic_helper_commit_modeset_enables(dev, state);
+