Skip to content

Commit

Permalink
Revert "dma-buf: heaps: Add CMA heap to dmabuf heaps"
Browse files Browse the repository at this point in the history
This reverts commit 43d7238.

This patchset doesn't meet the UAPI requirements set out in [1] for the DRM
subsystem. Once the userspace component is reviewed and ready for merge
we can try again.

[1]- https://01.org/linuxgraphics/gfx-docs/drm/gpu/drm-uapi.html#open-source-userspace-requirements

Fixes: 43d7238 ("dma-buf: heaps: Add CMA heap to dmabuf heaps")
Cc: Laura Abbott <[email protected]>
Cc: Benjamin Gaignard <[email protected]>
Cc: Sumit Semwal <[email protected]>
Cc: Liam Mark <[email protected]>
Cc: Pratik Patel <[email protected]>
Cc: Brian Starkey <[email protected]>
Cc: Vincent Donnefort <[email protected]>
Cc: Sudipto Paul <[email protected]>
Cc: Andrew F. Davis <[email protected]>
Cc: Christoph Hellwig <[email protected]>
Cc: Chenbo Feng <[email protected]>
Cc: Alistair Strachan <[email protected]>
Cc: Hridya Valsaraju <[email protected]>
Cc: Hillf Danton <[email protected]>
Cc: [email protected]
Cc: Brian Starkey <[email protected]>
Cc: John Stultz <[email protected]>
Cc: "Andrew F. Davis" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Acked-by: David Airlie <[email protected]>
Signed-off-by: Sean Paul <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
  • Loading branch information
atseanpaul committed Oct 30, 2019
1 parent a262ef0 commit 2e7f7cb
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 187 deletions.
8 changes: 0 additions & 8 deletions drivers/dma-buf/heaps/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,3 @@ config DMABUF_HEAPS_SYSTEM
help
Choose this option to enable the system dmabuf heap. The system heap
is backed by pages from the buddy allocator. If in doubt, say Y.

config DMABUF_HEAPS_CMA
bool "DMA-BUF CMA Heap"
depends on DMABUF_HEAPS && DMA_CMA
help
Choose this option to enable dma-buf CMA heap. This heap is backed
by the Contiguous Memory Allocator (CMA). If your system has these
regions, you should say Y here.
1 change: 0 additions & 1 deletion drivers/dma-buf/heaps/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# SPDX-License-Identifier: GPL-2.0
obj-y += heap-helpers.o
obj-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o
obj-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o
178 changes: 0 additions & 178 deletions drivers/dma-buf/heaps/cma_heap.c

This file was deleted.

0 comments on commit 2e7f7cb

Please sign in to comment.