diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-05-27 15:12:04 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-05-28 10:36:27 +0200 |
commit | 584d4bf1d3c2265a810e1494eb5c8ef0a72ee934 (patch) | |
tree | 20b3364aee884d3f65f246c16ee7f8bd4a465ea2 /target/linux/bcm27xx/patches-5.4/950-0726-udmabuf-Remove-deleted-map-unmap-handlers.patch | |
parent | 9e467a764b4e30a04dd0431ea277f6acd26babe0 (diff) | |
download | upstream-584d4bf1d3c2265a810e1494eb5c8ef0a72ee934.tar.gz upstream-584d4bf1d3c2265a810e1494eb5c8ef0a72ee934.tar.bz2 upstream-584d4bf1d3c2265a810e1494eb5c8ef0a72ee934.zip |
bcm27xx: update patches from RPi foundation
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 3B v1.2
bcm2710: boot tested on RPi 3B v1.2
bcm2711: boot tested on RPi 4B v1.1 4G
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0726-udmabuf-Remove-deleted-map-unmap-handlers.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0726-udmabuf-Remove-deleted-map-unmap-handlers.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0726-udmabuf-Remove-deleted-map-unmap-handlers.patch b/target/linux/bcm27xx/patches-5.4/950-0726-udmabuf-Remove-deleted-map-unmap-handlers.patch new file mode 100644 index 0000000000..bc7b5bea91 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0726-udmabuf-Remove-deleted-map-unmap-handlers.patch @@ -0,0 +1,52 @@ +From b1f02a027329f23272bd89c80a3f51ff64377fc2 Mon Sep 17 00:00:00 2001 +From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> +Date: Tue, 26 Nov 2019 15:25:16 +0100 +Subject: [PATCH] udmabuf: Remove deleted map/unmap handlers. + +Commit 19d32ace8b6acebc45da1ea748000ac79ccc7721 upstream. + +Commit 7f0de8d80816 ("dma-buf: Drop dma_buf_k(un)map") removed map/unmap +handlers, but they still existed in udmabuf. Remove them there as well + +Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> +Fixes: 7f0de8d80816 ("dma-buf: Drop dma_buf_k(un)map") +Cc: Sumit Semwal <sumit.semwal@linaro.org> +Cc: Daniel Vetter <daniel.vetter@intel.com> +Cc: linux-media@vger.kernel.org +Cc: linaro-mm-sig@lists.linaro.org +Cc: dri-devel@lists.freedesktop.org +Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> +Link: https://patchwork.freedesktop.org/patch/msgid/20191126142516.630200-1-maarten.lankhorst@linux.intel.com +--- + drivers/dma-buf/udmabuf.c | 16 ---------------- + 1 file changed, 16 deletions(-) + +--- a/drivers/dma-buf/udmabuf.c ++++ b/drivers/dma-buf/udmabuf.c +@@ -93,26 +93,10 @@ static void release_udmabuf(struct dma_b + kfree(ubuf); + } + +-static void *kmap_udmabuf(struct dma_buf *buf, unsigned long page_num) +-{ +- struct udmabuf *ubuf = buf->priv; +- struct page *page = ubuf->pages[page_num]; +- +- return kmap(page); +-} +- +-static void kunmap_udmabuf(struct dma_buf *buf, unsigned long page_num, +- void *vaddr) +-{ +- kunmap(vaddr); +-} +- + static const struct dma_buf_ops udmabuf_ops = { + .map_dma_buf = map_udmabuf, + .unmap_dma_buf = unmap_udmabuf, + .release = release_udmabuf, +- .map = kmap_udmabuf, +- .unmap = kunmap_udmabuf, + .mmap = mmap_udmabuf, + }; + |