diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2017-02-10 13:26:34 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2017-02-10 13:26:34 +0000 |
| commit | 75d1ad4d4b73e05817151d98499af7e6e9f39183 (patch) | |
| tree | 9d9da28f1035e7891c80fbd96c40d161c6f2089f | |
| parent | 1bc62ddc806f05d6ce37097ab27629489e5308a6 (diff) | |
| download | kernel-75d1ad4d4b73e05817151d98499af7e6e9f39183.tar.gz kernel-75d1ad4d4b73e05817151d98499af7e6e9f39183.tar.xz kernel-75d1ad4d4b73e05817151d98499af7e6e9f39183.zip | |
Fix OOPSes in vc4 (Raspberry Pi)
| -rw-r--r-- | drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch | 42 | ||||
| -rw-r--r-- | kernel.spec | 5 |
2 files changed, 47 insertions, 0 deletions
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); diff --git a/kernel.spec b/kernel.spec index 74dccdf90..dee7635a4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -524,6 +524,8 @@ Patch430: ARM-tegra-usb-no-reset.patch Patch431: bcm2837-initial-support.patch +Patch432: drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch + # http://www.spinics.net/lists/linux-mmc/msg41151.html Patch433: bcm283x-mmc-imp-speed.patch @@ -2176,6 +2178,9 @@ fi # # %changelog +* Thu Feb 9 2017 Peter Robinson <pbrobinson@fedoraproject.org> +- Fix OOPSes in vc4 (Raspberry Pi) + * Thu Feb 09 2017 Laura Abbott <labbott@fedoraproject.org> - 4.9.9-100 - Linux v4.9.9 - Fix DMA on stack from 1-wire driver (rhbz 1415397) |