diff options
| -rw-r--r-- | baseconfig/s390x/CONFIG_RMI4_F03 | 1 | ||||
| -rw-r--r-- | drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch | 42 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel-s390x-debug.config | 2 | ||||
| -rw-r--r-- | kernel-s390x.config | 2 | ||||
| -rw-r--r-- | kernel.spec | 13 | ||||
| -rw-r--r-- | sources | 2 |
7 files changed, 58 insertions, 6 deletions
diff --git a/baseconfig/s390x/CONFIG_RMI4_F03 b/baseconfig/s390x/CONFIG_RMI4_F03 new file mode 100644 index 000000000..effd70c36 --- /dev/null +++ b/baseconfig/s390x/CONFIG_RMI4_F03 @@ -0,0 +1 @@ +# CONFIG_RMI4_F03 is not set diff --git a/drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch b/drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch new file mode 100644 index 000000000..70a528253 --- /dev/null +++ b/drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch @@ -0,0 +1,42 @@ +From patchwork Thu Feb 9 18:16:00 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: drm/vc4: Fix OOPSes from trying to cache a partially constructed BO. +From: Eric Anholt <eric@anholt.net> +X-Patchwork-Id: 138087 +Message-Id: <20170209181600.24048-1-eric@anholt.net> +To: dri-devel@lists.freedesktop.org +Cc: linux-kernel@vger.kernel.org, pbrobinson@gmail.com +Date: Thu, 9 Feb 2017 10:16:00 -0800 + +If a CMA allocation failed, the partially constructed BO would be +unreferenced through the normal path, and we might choose to put it in +the BO cache. If we then reused it before it expired from the cache, +the kernel would OOPS. + +Signed-off-by: Eric Anholt <eric@anholt.net> +Fixes: c826a6e10644 ("drm/vc4: Add a BO cache.") +--- + drivers/gpu/drm/vc4/vc4_bo.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c +index 5ec14f25625d..fd83a2807656 100644 +--- a/drivers/gpu/drm/vc4/vc4_bo.c ++++ b/drivers/gpu/drm/vc4/vc4_bo.c +@@ -314,6 +314,14 @@ void vc4_free_object(struct drm_gem_object *gem_bo) + goto out; + } + ++ /* If this object was partially constructed but CMA allocation ++ * had failed, just free it. ++ */ ++ if (!bo->base.vaddr) { ++ vc4_bo_destroy(bo); ++ goto out; ++ } ++ + cache_list = vc4_get_cache_list_for_size(dev, gem_bo->size); + if (!cache_list) { + vc4_bo_destroy(bo); @@ -1 +1 @@ -926af6273fc683cd98cd0ce7bf0d04a02eed6742 +55aac6ef53e114c28170ee3f79065cfa8ca9cf3f diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index d040d077d..005eefbaa 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3707,7 +3707,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RIO is not set CONFIG_RMI4_CORE=m -CONFIG_RMI4_F03=y +# CONFIG_RMI4_F03 is not set CONFIG_RMI4_F11=y CONFIG_RMI4_F12=y CONFIG_RMI4_F30=y diff --git a/kernel-s390x.config b/kernel-s390x.config index b90aaab80..53a1ef4a4 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3685,7 +3685,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RIO is not set CONFIG_RMI4_CORE=m -CONFIG_RMI4_F03=y +# CONFIG_RMI4_F03 is not set CONFIG_RMI4_F11=y CONFIG_RMI4_F12=y CONFIG_RMI4_F30=y diff --git a/kernel.spec b/kernel.spec index 1e86722d6..591877a35 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 7 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -544,8 +544,11 @@ Patch431: bcm283x-mmc-imp-speed.patch Patch432: bcm283x-VEC.patch +# http://www.spinics.net/lists/dri-devel/msg132235.html +Patch433: drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch + # http://www.spinics.net/lists/arm-kernel/msg552554.html -Patch434: arm-imx6-hummingboard2.patch +Patch438: arm-imx6-hummingboard2.patch Patch460: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch @@ -2189,6 +2192,12 @@ fi # # %changelog +* Thu Feb 09 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc7.git3.1 +- Linux v4.10-rc7-114-g55aac6e + +* Thu Feb 9 2017 Peter Robinson <pbrobinson@fedoraproject.org> +- Fix OOPSes in vc4 (Raspberry Pi) + * Wed Feb 08 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc7.git2.1 - Linux v4.10-rc7-65-g926af627 @@ -1,4 +1,4 @@ SHA512 (linux-4.9.tar.xz) = bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a SHA512 (perf-man-4.9.tar.gz) = d23bb3da1eadd6623fddbf4696948de7675f3dcf57c711a7427dd7ae111394f58d8f42752938bbea7cd219f1e7f6f116fc67a1c74f769711063940a065f37b99 SHA512 (patch-4.10-rc7.xz) = 206e5e97581bb376141398b6962fbbc4ee0a58b50fae1de83f3f6f3c06502b260f006628aab738d63994a6d1c0276717d49e882a8107b8f9c24d565a2a70ea9b -SHA512 (patch-4.10-rc7-git2.xz) = eab140627e4d14eabe40b69c34e50418fa9ec5602506e2a5d80b92de11b182ef86378df64461770767e667ac0045d988ca3c22d7509786088e4bd9945d0eb233 +SHA512 (patch-4.10-rc7-git3.xz) = 09ca5268d4e4b3ef82a086f2a2496adf47d522b3e98b9c020ffad9078f4af381f06c61140a726f1b6b2611ee014637eaac76e0df04c03e123609b742a09ac801 |