aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.4/0114-drm-vc4-Update-a-bunch-of-code-to-match-upstream-sub.patch
diff options
context:
space:
mode:
authorEtienne Haarsma <bladeoner112@gmail.com>2017-12-21 10:28:16 +0100
committerMathias Kresin <dev@kresin.me>2017-12-23 09:42:33 +0100
commitf8a441e02030dda0ef66a440105e28a3c43188bc (patch)
tree14df28ab5b54cb95e9054c2ae42596c2f1a7c348 /target/linux/brcm2708/patches-4.4/0114-drm-vc4-Update-a-bunch-of-code-to-match-upstream-sub.patch
parentceea0ac25d987de1f84376405d38d43337d31cf5 (diff)
downloadupstream-f8a441e02030dda0ef66a440105e28a3c43188bc.tar.gz
upstream-f8a441e02030dda0ef66a440105e28a3c43188bc.tar.bz2
upstream-f8a441e02030dda0ef66a440105e28a3c43188bc.zip
kernel: bump 4.4 to 4.4.107
Bump 4.4 to 4.4.107 and refreshed all patches. Made the following patch for Mediatek and Oxnas compatible with kernel 4.4.107: 0072-mtd-backport-v4.7-0day-patches-from-Boris.patch Compile-tested: ar71xx Run-tested: ar71xx Signed-off-by: Etienne Haarsma <bladeoner112@gmail.com> Reviewed-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Tested-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0114-drm-vc4-Update-a-bunch-of-code-to-match-upstream-sub.patch')
-rw-r--r--target/linux/brcm2708/patches-4.4/0114-drm-vc4-Update-a-bunch-of-code-to-match-upstream-sub.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0114-drm-vc4-Update-a-bunch-of-code-to-match-upstream-sub.patch b/target/linux/brcm2708/patches-4.4/0114-drm-vc4-Update-a-bunch-of-code-to-match-upstream-sub.patch
index 29321c338e..8d8711d082 100644
--- a/target/linux/brcm2708/patches-4.4/0114-drm-vc4-Update-a-bunch-of-code-to-match-upstream-sub.patch
+++ b/target/linux/brcm2708/patches-4.4/0114-drm-vc4-Update-a-bunch-of-code-to-match-upstream-sub.patch
@@ -1869,7 +1869,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
}
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
-@@ -585,6 +585,13 @@ struct drm_driver {
+@@ -599,6 +599,13 @@ struct drm_driver {
int (*gem_open_object) (struct drm_gem_object *, struct drm_file *);
void (*gem_close_object) (struct drm_gem_object *, struct drm_file *);
@@ -1883,7 +1883,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
/* prime: */
/* export handle -> fd (see drm_gem_prime_handle_to_fd() helper) */
int (*prime_handle_to_fd)(struct drm_device *dev, struct drm_file *file_priv,
-@@ -639,7 +646,6 @@ struct drm_driver {
+@@ -653,7 +660,6 @@ struct drm_driver {
u32 driver_features;
int dev_priv_size;