aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.14/950-0354-drm-vc4-Advertise-supported-modifiers-for-planes.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-02-13 11:38:08 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-02-14 16:45:01 +0100
commit9a1d7ff187300767f77401302b43733ee01080b4 (patch)
tree7ea9dd08a1b436b0567f64d72e149ea0a960b0a7 /target/linux/brcm2708/patches-4.14/950-0354-drm-vc4-Advertise-supported-modifiers-for-planes.patch
parenta23a13dec27109bbd7171921ec9a89154aabbf26 (diff)
downloadupstream-9a1d7ff187300767f77401302b43733ee01080b4.tar.gz
upstream-9a1d7ff187300767f77401302b43733ee01080b4.tar.bz2
upstream-9a1d7ff187300767f77401302b43733ee01080b4.zip
kernel: bump 4.14 to 4.14.99
Refreshed all patches. Remove upstreamed: - 950-0434-mmc-bcm2835-Recover-from-MMC_SEND_EXT_CSD.patch Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0354-drm-vc4-Advertise-supported-modifiers-for-planes.patch')
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0354-drm-vc4-Advertise-supported-modifiers-for-planes.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0354-drm-vc4-Advertise-supported-modifiers-for-planes.patch b/target/linux/brcm2708/patches-4.14/950-0354-drm-vc4-Advertise-supported-modifiers-for-planes.patch
index 95d2402493..c48c6124bc 100644
--- a/target/linux/brcm2708/patches-4.14/950-0354-drm-vc4-Advertise-supported-modifiers-for-planes.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0354-drm-vc4-Advertise-supported-modifiers-for-planes.patch
@@ -33,7 +33,7 @@ Link: https://patchwork.freedesktop.org/patch/170828/
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -868,6 +868,32 @@ out:
+@@ -870,6 +870,32 @@ out:
ctx);
}
@@ -66,7 +66,7 @@ Link: https://patchwork.freedesktop.org/patch/170828/
static const struct drm_plane_funcs vc4_plane_funcs = {
.update_plane = vc4_update_plane,
.disable_plane = drm_atomic_helper_disable_plane,
-@@ -876,6 +902,7 @@ static const struct drm_plane_funcs vc4_
+@@ -878,6 +904,7 @@ static const struct drm_plane_funcs vc4_
.reset = vc4_plane_reset,
.atomic_duplicate_state = vc4_plane_duplicate_state,
.atomic_destroy_state = vc4_plane_destroy_state,
@@ -74,7 +74,7 @@ Link: https://patchwork.freedesktop.org/patch/170828/
};
struct drm_plane *vc4_plane_init(struct drm_device *dev,
-@@ -887,6 +914,11 @@ struct drm_plane *vc4_plane_init(struct
+@@ -889,6 +916,11 @@ struct drm_plane *vc4_plane_init(struct
u32 num_formats = 0;
int ret = 0;
unsigned i;
@@ -86,7 +86,7 @@ Link: https://patchwork.freedesktop.org/patch/170828/
vc4_plane = devm_kzalloc(dev->dev, sizeof(*vc4_plane),
GFP_KERNEL);
-@@ -907,7 +939,7 @@ struct drm_plane *vc4_plane_init(struct
+@@ -909,7 +941,7 @@ struct drm_plane *vc4_plane_init(struct
ret = drm_universal_plane_init(dev, plane, 0,
&vc4_plane_funcs,
formats, num_formats,