[20/29] gpu/drm: remove the powerpc hack in drm_legacy_sg_alloc
diff mbox series

Message ID 20200414131348.444715-21-hch@lst.de
State In Next
Commit cf1bd8e23a304edf762b73f4a74c9b99cd0e5909
Headers show
  • [01/29] x86/hyperv: use vmalloc_exec for the hypercall page
Related show

Commit Message

Christoph Hellwig April 14, 2020, 1:13 p.m. UTC
The non-cached vmalloc mapping was initially added as a hack for the
first-gen amigaone platform (6xx/book32s), isn't fully supported
upstream, and which used the legacy radeon driver together with
non-coherent DMA. However this only ever worked reliably for DRI .

Remove the hack as it is the last user of __vmalloc passing a page
protection flag other than PAGE_KERNEL and didn't do anything for
other platforms with non-coherent DMA.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
 drivers/gpu/drm/drm_scatter.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff mbox series

diff --git a/drivers/gpu/drm/drm_scatter.c b/drivers/gpu/drm/drm_scatter.c
index ca520028b2cb..f4e6184d1877 100644
--- a/drivers/gpu/drm/drm_scatter.c
+++ b/drivers/gpu/drm/drm_scatter.c
@@ -43,15 +43,6 @@ 
 #define DEBUG_SCATTER 0
-static inline void *drm_vmalloc_dma(unsigned long size)
-#if defined(__powerpc__) && defined(CONFIG_NOT_COHERENT_CACHE)
-	return __vmalloc(size, GFP_KERNEL, pgprot_noncached_wc(PAGE_KERNEL));
-	return vmalloc_32(size);
 static void drm_sg_cleanup(struct drm_sg_mem * entry)
 	struct page *page;
@@ -126,7 +117,7 @@  int drm_legacy_sg_alloc(struct drm_device *dev, void *data,
 		return -ENOMEM;
-	entry->virtual = drm_vmalloc_dma(pages << PAGE_SHIFT);
+	entry->virtual = vmalloc_32(pages << PAGE_SHIFT);
 	if (!entry->virtual) {