Revert "DMA-BUF Heaps (destaging ION)"
cover Revert "DMA-BUF Heaps (destaging ION)"
From: Sean Paul <[email protected]>
While the kernel set has a solid number of r-b's and acks, the userspace component does not meet the drm requirements of being "reviewed and ready for merging into a suitable and canonical upstream project".
Once the userspace portion has been reviewed, let's try again.
Sean
[1] https://01.org/linuxgraphics/gfx-docs/drm/gpu/drm-uapi.html#open-source-userspace-requirements
Sean Paul (5):
Revert "kselftests: Add dma-heap test"
Revert "dma-buf: heaps: Add CMA heap to dmabuf heaps" Revert "dma-buf: heaps: Add system heap to dmabuf heaps" Revert "dma-buf: heaps: Add heap helpers" Revert "dma-buf: Add dma-buf heaps framework"
MAINTAINERS | 18 -- drivers/dma-buf/Kconfig | 11 - drivers/dma-buf/Makefile | 2 - drivers/dma-buf/dma-heap.c | 269 ------------------ drivers/dma-buf/heaps/Kconfig | 14 - drivers/dma-buf/heaps/Makefile | 4 - drivers/dma-buf/heaps/cma_heap.c | 178 ------------ drivers/dma-buf/heaps/heap-helpers.c | 268 ----------------- drivers/dma-buf/heaps/heap-helpers.h | 55 ---- drivers/dma-buf/heaps/system_heap.c | 124 -------- include/linux/dma-heap.h | 59 ---- include/uapi/linux/dma-heap.h | 55 ---- tools/testing/selftests/dmabuf-heaps/Makefile | 9 - .../selftests/dmabuf-heaps/dmabuf-heap.c | 238 ---------------- 14 files changed, 1304 deletions(-) delete mode 100644 drivers/dma-buf/dma-heap.c delete mode 100644 drivers/dma-buf/heaps/Kconfig delete mode 100644 drivers/dma-buf/heaps/Makefile delete mode 100644 drivers/dma-buf/heaps/cma_heap.c delete mode 100644 drivers/dma-buf/heaps/heap-helpers.c delete mode 100644 drivers/dma-buf/heaps/heap-helpers.h delete mode 100644 drivers/dma-buf/heaps/system_heap.c delete mode 100644 include/linux/dma-heap.h delete mode 100644 include/uapi/linux/dma-heap.h delete mode 100644 tools/testing/selftests/dmabuf-heaps/Makefile delete mode 100644 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/5 Revert "kselftests: Add dma-heap test"
From: Sean Paul <[email protected]>
This reverts commit ab87cc9754cdeb373c8ac030ac7aed92f450b767.
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
--- tools/testing/selftests/dmabuf-heaps/Makefile | 9 - .../selftests/dmabuf-heaps/dmabuf-heap.c | 238 ------------------ 2 files changed, 247 deletions(-) delete mode 100644 tools/testing/selftests/dmabuf-heaps/Makefile delete mode 100644 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
tools/testing/selftests/dmabuf-heaps/Makefile deleted +0 -9
@@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -CFLAGS += -static -O3 -Wl,-no-as-needed -Wall -#LDLIBS += -lrt -lpthread -lm - -# these are all "safe" tests that don't modify -# system time or require escalated privileges -TEST_GEN_PROGS = dmabuf-heap - -include ../lib.mk
tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c deleted +0 -238
238 lines not on this page · raw message
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/5 Revert "dma-buf: heaps: Add CMA heap to dmabuf heaps"
In reply to Sean PaulFrom: Sean Paul <[email protected]>
This reverts commit 43d7238fb9ac897b29912368b3359e72bae469c4.
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
--- drivers/dma-buf/heaps/Kconfig | 8 -- drivers/dma-buf/heaps/Makefile | 1 - drivers/dma-buf/heaps/cma_heap.c | 178 ------------------------------- 3 files changed, 187 deletions(-) delete mode 100644 drivers/dma-buf/heaps/cma_heap.c
drivers/dma-buf/heaps/Kconfig +0 -8
@@ -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.
drivers/dma-buf/heaps/Makefile +0 -1
@@ -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
drivers/dma-buf/heaps/cma_heap.c deleted +0 -178
178 lines not on this page · raw message
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 3/5 Revert "dma-buf: heaps: Add system heap to dmabuf heaps"
In reply to Sean PaulFrom: Sean Paul <[email protected]>
This reverts commit 47a32f9c12266d450b92089148c6039591bd9909.
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
--- drivers/dma-buf/Kconfig | 2 - drivers/dma-buf/heaps/Kconfig | 6 -- drivers/dma-buf/heaps/Makefile | 1 - drivers/dma-buf/heaps/system_heap.c | 124 ---------------------------- 4 files changed, 133 deletions(-) delete mode 100644 drivers/dma-buf/heaps/Kconfig delete mode 100644 drivers/dma-buf/heaps/system_heap.c
drivers/dma-buf/Kconfig +0 -2
@@ -53,6 +53,4 @@ menuconfig DMABUF_HEAPS allows userspace to allocate dma-bufs that can be shared between drivers. -source "drivers/dma-buf/heaps/Kconfig" - endmenu
drivers/dma-buf/heaps/Kconfig deleted +0 -6
@@ -1,6 +0,0 @@ -config DMABUF_HEAPS_SYSTEM - bool "DMA-BUF System Heap" - depends on DMABUF_HEAPS - 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.
drivers/dma-buf/heaps/Makefile +0 -1
@@ -1,3 +1,2 @@ # SPDX-License-Identifier: GPL-2.0 obj-y += heap-helpers.o -obj-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o
drivers/dma-buf/heaps/system_heap.c deleted +0 -124
124 lines not on this page · raw message
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 4/5 Revert "dma-buf: heaps: Add heap helpers"
In reply to Sean PaulFrom: Sean Paul <[email protected]>
This reverts commit 7b87ea704fd9606eaafa9150116536d72f5c4b1f.
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
--- drivers/dma-buf/Makefile | 1 - drivers/dma-buf/heaps/Makefile | 2 - drivers/dma-buf/heaps/heap-helpers.c | 268 --------------------------- drivers/dma-buf/heaps/heap-helpers.h | 55 ------ 4 files changed, 326 deletions(-) delete mode 100644 drivers/dma-buf/heaps/Makefile delete mode 100644 drivers/dma-buf/heaps/heap-helpers.c delete mode 100644 drivers/dma-buf/heaps/heap-helpers.h
drivers/dma-buf/Makefile +0 -1
@@ -2,7 +2,6 @@ obj-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \ dma-resv.o seqno-fence.o obj-$(CONFIG_DMABUF_HEAPS) += dma-heap.o -obj-$(CONFIG_DMABUF_HEAPS) += heaps/ obj-$(CONFIG_SYNC_FILE) += sync_file.o obj-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o obj-$(CONFIG_UDMABUF) += udmabuf.o
drivers/dma-buf/heaps/Makefile deleted +0 -2
@@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -obj-y += heap-helpers.o
drivers/dma-buf/heaps/heap-helpers.c deleted +0 -268
268 lines not on this page · raw message
drivers/dma-buf/heaps/heap-helpers.h deleted +0 -55
55 lines not on this page · raw message
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 5/5 Revert "dma-buf: Add dma-buf heaps framework"
In reply to Sean PaulFrom: Sean Paul <[email protected]>
This reverts commit a69b0e855d3fd278ff6f09a23e1edf929538e304.
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
--- MAINTAINERS | 18 --- drivers/dma-buf/Kconfig | 9 -- drivers/dma-buf/Makefile | 1 - drivers/dma-buf/dma-heap.c | 269 ---------------------------------- include/linux/dma-heap.h | 59 -------- include/uapi/linux/dma-heap.h | 55 ------- 6 files changed, 411 deletions(-) delete mode 100644 drivers/dma-buf/dma-heap.c delete mode 100644 include/linux/dma-heap.h delete mode 100644 include/uapi/linux/dma-heap.h
MAINTAINERS +0 -18
@@ -4942,24 +4942,6 @@ F: include/linux/*fence.h F: Documentation/driver-api/dma-buf.rst T: git git://anongit.freedesktop.org/drm/drm-misc -DMA-BUF HEAPS FRAMEWORK -M: Sumit Semwal <[email protected]> -R: Andrew F. Davis <[email protected]> -R: Benjamin Gaignard <[email protected]> -R: Liam Mark <[email protected]> -R: Laura Abbott <[email protected]> -R: Brian Starkey <[email protected]> -R: John Stultz <[email protected]> -S: Maintained -L: [email protected] -L: [email protected] -L: [email protected] (moderated for non-subscribers) -F: include/uapi/linux/dma-heap.h -F: include/linux/dma-heap.h -F: drivers/dma-buf/dma-heap.c -F: drivers/dma-buf/heaps/* -T: git git://anongit.freedesktop.org/drm/drm-misc - DMA GENERIC OFFLOAD ENGINE SUBSYSTEM M: Vinod Koul <[email protected]> L: [email protected]
drivers/dma-buf/Kconfig +0 -9
@@ -44,13 +44,4 @@ config DMABUF_SELFTESTS default n depends on DMA_SHARED_BUFFER -menuconfig DMABUF_HEAPS - bool "DMA-BUF Userland Memory Heaps" - select DMA_SHARED_BUFFER - help - Choose this option to enable the DMA-BUF userland memory heaps. - This options creates per heap chardevs in /dev/dma_heap/ which - allows userspace to allocate dma-bufs that can be shared - between drivers. - endmenu
drivers/dma-buf/Makefile +0 -1
@@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only obj-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \ dma-resv.o seqno-fence.o -obj-$(CONFIG_DMABUF_HEAPS) += dma-heap.o obj-$(CONFIG_SYNC_FILE) += sync_file.o obj-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o obj-$(CONFIG_UDMABUF) += udmabuf.o
drivers/dma-buf/dma-heap.c deleted +0 -269
269 lines not on this page · raw message
include/linux/dma-heap.h deleted +0 -59
59 lines not on this page · raw message
include/uapi/linux/dma-heap.h deleted +0 -55
55 lines not on this page · raw message
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sean Paul
AppliedQuoted 10 lines · Sean Paul
From: Sean Paul <[email protected]>
While the kernel set has a solid number of r-b's and acks, the userspace component does not meet the drm requirements of being "reviewed and ready for merging into a suitable and canonical upstream project".
Once the userspace portion has been reviewed, let's try again.
Pushed to drm-misc-next.
Sean
Quoted 38 lines
Sean
[1] https://01.org/linuxgraphics/gfx-docs/drm/gpu/drm-uapi.html#open-source-userspace-requirements
Sean Paul (5):
Revert "kselftests: Add dma-heap test"
Revert "dma-buf: heaps: Add CMA heap to dmabuf heaps" Revert "dma-buf: heaps: Add system heap to dmabuf heaps" Revert "dma-buf: heaps: Add heap helpers" Revert "dma-buf: Add dma-buf heaps framework"MAINTAINERS | 18 -- drivers/dma-buf/Kconfig | 11 - drivers/dma-buf/Makefile | 2 - drivers/dma-buf/dma-heap.c | 269 ------------------ drivers/dma-buf/heaps/Kconfig | 14 - drivers/dma-buf/heaps/Makefile | 4 - drivers/dma-buf/heaps/cma_heap.c | 178 ------------ drivers/dma-buf/heaps/heap-helpers.c | 268 ----------------- drivers/dma-buf/heaps/heap-helpers.h | 55 ---- drivers/dma-buf/heaps/system_heap.c | 124 -------- include/linux/dma-heap.h | 59 ---- include/uapi/linux/dma-heap.h | 55 ---- tools/testing/selftests/dmabuf-heaps/Makefile | 9 - .../selftests/dmabuf-heaps/dmabuf-heap.c | 238 ---------------- 14 files changed, 1304 deletions(-) delete mode 100644 drivers/dma-buf/dma-heap.c delete mode 100644 drivers/dma-buf/heaps/Kconfig delete mode 100644 drivers/dma-buf/heaps/Makefile delete mode 100644 drivers/dma-buf/heaps/cma_heap.c delete mode 100644 drivers/dma-buf/heaps/heap-helpers.c delete mode 100644 drivers/dma-buf/heaps/heap-helpers.h delete mode 100644 drivers/dma-buf/heaps/system_heap.c delete mode 100644 include/linux/dma-heap.h delete mode 100644 include/uapi/linux/dma-heap.h delete mode 100644 tools/testing/selftests/dmabuf-heaps/Makefile delete mode 100644 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
Quoted 3 lines
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel