diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-10-06 19:09:03 -0700 |
---|---|---|
committer | Andrei Gherzan <andrei@resin.io> | 2016-10-13 10:39:50 +0200 |
commit | 5697e77ec4b53c2f4618d20bfe0af16cd3dee604 (patch) | |
tree | 0a90485d4ca48ffaaee1b4de9e98a3802e73cc6d | |
parent | 4817e2c087097c02755d6309304878e42cf61d3c (diff) | |
download | meta-raspberrypi-5697e77ec4b53c2f4618d20bfe0af16cd3dee604.tar.gz |
linux-raspberrypi_4.4: Upgrade to 4.4.23
Drop upstreamed patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | recipes-kernel/linux/linux-raspberrypi-4.4/0002-vc4-ioctl-rendering-allow.patch | 29 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-raspberrypi_4.4.bb | 5 |
2 files changed, 2 insertions, 32 deletions
diff --git a/recipes-kernel/linux/linux-raspberrypi-4.4/0002-vc4-ioctl-rendering-allow.patch b/recipes-kernel/linux/linux-raspberrypi-4.4/0002-vc4-ioctl-rendering-allow.patch deleted file mode 100644 index 59d0ed7..0000000 --- a/recipes-kernel/linux/linux-raspberrypi-4.4/0002-vc4-ioctl-rendering-allow.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | This patch has been accepted upstream in kernel 4.7-rc3 | ||
2 | But it has not yet been backported to 4.4... | ||
3 | Upstream-Status: Accepted [http://www.gossamer-threads.com/lists/linux/kernel/2459302] | ||
4 | Signed-off-by: Herve Jourdain <herve.jourdain@neuf.fr> | ||
5 | --- | ||
6 | |||
7 | diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c | ||
8 | index a5b68c1..14b5ec1 100644 | ||
9 | --- a/drivers/gpu/drm/vc4/vc4_drv.c | ||
10 | +++ b/drivers/gpu/drm/vc4/vc4_drv.c | ||
11 | @@ -75,12 +75,12 @@ static const struct file_operations vc4_drm_fops = { | ||
12 | }; | ||
13 | |||
14 | static const struct drm_ioctl_desc vc4_drm_ioctls[] = { | ||
15 | - DRM_IOCTL_DEF_DRV(VC4_SUBMIT_CL, vc4_submit_cl_ioctl, 0), | ||
16 | - DRM_IOCTL_DEF_DRV(VC4_WAIT_SEQNO, vc4_wait_seqno_ioctl, 0), | ||
17 | - DRM_IOCTL_DEF_DRV(VC4_WAIT_BO, vc4_wait_bo_ioctl, 0), | ||
18 | - DRM_IOCTL_DEF_DRV(VC4_CREATE_BO, vc4_create_bo_ioctl, 0), | ||
19 | - DRM_IOCTL_DEF_DRV(VC4_MMAP_BO, vc4_mmap_bo_ioctl, 0), | ||
20 | - DRM_IOCTL_DEF_DRV(VC4_CREATE_SHADER_BO, vc4_create_shader_bo_ioctl, 0), | ||
21 | + DRM_IOCTL_DEF_DRV(VC4_SUBMIT_CL, vc4_submit_cl_ioctl, 0|DRM_RENDER_ALLOW), | ||
22 | + DRM_IOCTL_DEF_DRV(VC4_WAIT_SEQNO, vc4_wait_seqno_ioctl, 0|DRM_RENDER_ALLOW), | ||
23 | + DRM_IOCTL_DEF_DRV(VC4_WAIT_BO, vc4_wait_bo_ioctl, 0|DRM_RENDER_ALLOW), | ||
24 | + DRM_IOCTL_DEF_DRV(VC4_CREATE_BO, vc4_create_bo_ioctl, 0|DRM_RENDER_ALLOW), | ||
25 | + DRM_IOCTL_DEF_DRV(VC4_MMAP_BO, vc4_mmap_bo_ioctl, 0|DRM_RENDER_ALLOW), | ||
26 | + DRM_IOCTL_DEF_DRV(VC4_CREATE_SHADER_BO, vc4_create_shader_bo_ioctl, 0|DRM_RENDER_ALLOW), | ||
27 | DRM_IOCTL_DEF_DRV(VC4_GET_HANG_STATE, vc4_get_hang_state_ioctl, | ||
28 | DRM_ROOT_ONLY), | ||
29 | }; | ||
diff --git a/recipes-kernel/linux/linux-raspberrypi_4.4.bb b/recipes-kernel/linux/linux-raspberrypi_4.4.bb index 9a49dc1..4b15f88 100644 --- a/recipes-kernel/linux/linux-raspberrypi_4.4.bb +++ b/recipes-kernel/linux/linux-raspberrypi_4.4.bb | |||
@@ -1,10 +1,9 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" |
2 | 2 | ||
3 | LINUX_VERSION ?= "4.4.16" | 3 | LINUX_VERSION ?= "4.4.23" |
4 | 4 | ||
5 | SRCREV = "cff67c7e03f4333149f2a8f6eafd3bc44475114a" | 5 | SRCREV = "c2a1d975537fcac01da80ce34f10bc491620a64e" |
6 | SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.4.y \ | 6 | SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.4.y \ |
7 | file://0001-fix-dtbo-rules.patch \ | 7 | file://0001-fix-dtbo-rules.patch \ |
8 | file://0002-vc4-ioctl-rendering-allow.patch \ | ||
9 | " | 8 | " |
10 | require linux-raspberrypi.inc | 9 | require linux-raspberrypi.inc |