[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1314758512-19285-7-git-send-email-konrad.wilk@oracle.com>
Date: Tue, 30 Aug 2011 22:41:51 -0400
From: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
To: thellstrom@...are.com, linux-kernel@...r.kernel.org,
dri-devel@...ts.freedesktop.org, bskeggs@...hat.com,
j.glisse@...hat.com, thomas@...pmail.org, airlied@...hat.com,
airlied@...ux.ie, alexdeucher@...il.com
Cc: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Subject: [PATCH 6/7] ttm: Add 'no_dma' parameter to turn the TTM DMA pool off during runtime.
The TTM DMA only gets turned on when the SWIOTLB is enabled - but
we might also want to turn it off when SWIOTLB is on to
use the non-DMA TTM pool code.
In the future this parameter can be removed.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
---
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 4 ++++
include/drm/ttm/ttm_page_alloc.h | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
index c024c10..9940efd 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
@@ -51,6 +51,10 @@
#include <asm/agp.h>
#endif
+int __read_mostly dma_ttm_disable;
+MODULE_PARM_DESC(no_dma, "Disable TTM DMA pool");
+module_param_named(no_dma, dma_ttm_disable, bool, S_IRUGO);
+
#define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
#define SMALL_ALLOCATION 16
#define FREE_ALL_PAGES (~0U)
diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
index 192c5f8..e75af77 100644
--- a/include/drm/ttm/ttm_page_alloc.h
+++ b/include/drm/ttm/ttm_page_alloc.h
@@ -103,10 +103,10 @@ extern struct ttm_page_alloc_func ttm_page_alloc_default;
#ifdef CONFIG_SWIOTLB
/* Defined in ttm_page_alloc_dma.c */
extern struct ttm_page_alloc_func ttm_page_alloc_dma;
-
+extern int dma_ttm_disable;
static inline bool ttm_page_alloc_need_dma(void)
{
- if (swiotlb_enabled()) {
+ if (!dma_ttm_disable && swiotlb_enabled()) {
ttm_page_alloc = &ttm_page_alloc_dma;
return true;
}
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists