From 5697e77ec4b53c2f4618d20bfe0af16cd3dee604 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 6 Oct 2016 19:09:03 -0700 Subject: linux-raspberrypi_4.4: Upgrade to 4.4.23 Drop upstreamed patch Signed-off-by: Khem Raj --- .../0002-vc4-ioctl-rendering-allow.patch | 29 ---------------------- recipes-kernel/linux/linux-raspberrypi_4.4.bb | 5 ++-- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 recipes-kernel/linux/linux-raspberrypi-4.4/0002-vc4-ioctl-rendering-allow.patch (limited to 'recipes-kernel') 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 @@ -This patch has been accepted upstream in kernel 4.7-rc3 -But it has not yet been backported to 4.4... -Upstream-Status: Accepted [http://www.gossamer-threads.com/lists/linux/kernel/2459302] -Signed-off-by: Herve Jourdain ---- - -diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c -index a5b68c1..14b5ec1 100644 ---- a/drivers/gpu/drm/vc4/vc4_drv.c -+++ b/drivers/gpu/drm/vc4/vc4_drv.c -@@ -75,12 +75,12 @@ static const struct file_operations vc4_drm_fops = { - }; - - static const struct drm_ioctl_desc vc4_drm_ioctls[] = { -- DRM_IOCTL_DEF_DRV(VC4_SUBMIT_CL, vc4_submit_cl_ioctl, 0), -- DRM_IOCTL_DEF_DRV(VC4_WAIT_SEQNO, vc4_wait_seqno_ioctl, 0), -- DRM_IOCTL_DEF_DRV(VC4_WAIT_BO, vc4_wait_bo_ioctl, 0), -- DRM_IOCTL_DEF_DRV(VC4_CREATE_BO, vc4_create_bo_ioctl, 0), -- DRM_IOCTL_DEF_DRV(VC4_MMAP_BO, vc4_mmap_bo_ioctl, 0), -- DRM_IOCTL_DEF_DRV(VC4_CREATE_SHADER_BO, vc4_create_shader_bo_ioctl, 0), -+ DRM_IOCTL_DEF_DRV(VC4_SUBMIT_CL, vc4_submit_cl_ioctl, 0|DRM_RENDER_ALLOW), -+ DRM_IOCTL_DEF_DRV(VC4_WAIT_SEQNO, vc4_wait_seqno_ioctl, 0|DRM_RENDER_ALLOW), -+ DRM_IOCTL_DEF_DRV(VC4_WAIT_BO, vc4_wait_bo_ioctl, 0|DRM_RENDER_ALLOW), -+ DRM_IOCTL_DEF_DRV(VC4_CREATE_BO, vc4_create_bo_ioctl, 0|DRM_RENDER_ALLOW), -+ DRM_IOCTL_DEF_DRV(VC4_MMAP_BO, vc4_mmap_bo_ioctl, 0|DRM_RENDER_ALLOW), -+ DRM_IOCTL_DEF_DRV(VC4_CREATE_SHADER_BO, vc4_create_shader_bo_ioctl, 0|DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(VC4_GET_HANG_STATE, vc4_get_hang_state_ioctl, - DRM_ROOT_ONLY), - }; 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 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" -LINUX_VERSION ?= "4.4.16" +LINUX_VERSION ?= "4.4.23" -SRCREV = "cff67c7e03f4333149f2a8f6eafd3bc44475114a" +SRCREV = "c2a1d975537fcac01da80ce34f10bc491620a64e" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.4.y \ file://0001-fix-dtbo-rules.patch \ - file://0002-vc4-ioctl-rendering-allow.patch \ " require linux-raspberrypi.inc -- cgit v1.2.3-54-g00ecf