Re: [PATCH V2] drm/radeon: Include swiotlb.h if SWIOTLB configured.

2012-08-13 Thread Michel Dänzer
On Mon, 2012-08-13 at 20:40 +0800, Huacai Chen wrote: 
> When SWIOTLB is configured, if without this patch kernel compilation
> fails with such error messages:
> 
> drivers/gpu/drm/radeon/radeon_ttm.c: In function 'radeon_ttm_tt_populate':
> drivers/gpu/drm/radeon/radeon_ttm.c:606:2: error: implicit declaration of 
> function 'swiotlb_nr_tbl'
> drivers/gpu/drm/radeon/radeon_ttm.c:607:3: warning: passing argument 2 of 
> 'ttm_dma_populate' from incompatible pointer type
> include/drm/ttm/ttm_page_alloc.h:81:12: note: expected 'struct device *' but 
> argument is of type 'struct device *'
> drivers/gpu/drm/radeon/radeon_ttm.c: In function 'radeon_ttm_tt_unpopulate':
> drivers/gpu/drm/radeon/radeon_ttm.c:653:3: warning: passing argument 2 of 
> 'ttm_dma_unpopulate' from incompatible pointer type
> include/drm/ttm/ttm_page_alloc.h:82:13: note: expected 'struct device *' but 
> argument is of type 'struct device *'
> 
> V2:
> 1, Add compilation error messages;
> 2, Make the From: address the same as Signed-off-by address.
> 
> Signed-off-by: Huacai Chen 

Reviewed-by: Michel Dänzer 


-- 
Earthling Michel Dänzer   |   http://www.amd.com
Libre software enthusiast |  Debian, X and DRI developer
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH V2] drm/radeon: Include swiotlb.h if SWIOTLB configured.

2012-08-13 Thread Huacai Chen
When SWIOTLB is configured, if without this patch kernel compilation
fails with such error messages:

drivers/gpu/drm/radeon/radeon_ttm.c: In function 'radeon_ttm_tt_populate':
drivers/gpu/drm/radeon/radeon_ttm.c:606:2: error: implicit declaration of 
function 'swiotlb_nr_tbl'
drivers/gpu/drm/radeon/radeon_ttm.c:607:3: warning: passing argument 2 of 
'ttm_dma_populate' from incompatible pointer type
include/drm/ttm/ttm_page_alloc.h:81:12: note: expected 'struct device *' but 
argument is of type 'struct device *'
drivers/gpu/drm/radeon/radeon_ttm.c: In function 'radeon_ttm_tt_unpopulate':
drivers/gpu/drm/radeon/radeon_ttm.c:653:3: warning: passing argument 2 of 
'ttm_dma_unpopulate' from incompatible pointer type
include/drm/ttm/ttm_page_alloc.h:82:13: note: expected 'struct device *' but 
argument is of type 'struct device *'

V2:
1, Add compilation error messages;
2, Make the From: address the same as Signed-off-by address.

Signed-off-by: Huacai Chen 
Signed-off-by: Hongliang Tao 
Signed-off-by: Hua Yan 
Cc: dri-de...@lists.freedesktop.org
---
 drivers/gpu/drm/radeon/radeon_ttm.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c 
b/drivers/gpu/drm/radeon/radeon_ttm.c
index 5b71c71..fc3ac22 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -41,6 +41,10 @@
 #include "radeon_reg.h"
 #include "radeon.h"
 
+#ifdef CONFIG_SWIOTLB
+#include 
+#endif
+
 #define DRM_FILE_PAGE_OFFSET (0x1ULL >> PAGE_SHIFT)
 
 static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
-- 
1.7.7.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/