[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1343980862.1772.211.camel@thor.local>
Date: Fri, 03 Aug 2012 10:01:02 +0200
From: Michel Dänzer <michel@...nzer.net>
To: Huacai Chen <chenhuacai@...il.com>
Cc: Ralf Baechle <ralf@...ux-mips.org>, linux-mips@...ux-mips.org,
Zhangjin Wu <wuzhangjin@...il.com>, Hua Yan <yanh@...ote.com>,
Fuxin Zhang <zhangfx@...ote.com>, linux-kernel@...r.kernel.org,
dri-devel@...ts.freedesktop.org, Hongliang Tao <taohl@...ote.com>,
Huacai Chen <chenhc@...ote.com>
Subject: Re: [PATCH V4 11/16] drm/radeon: Make radeon card usable for
Loongson.
On Fre, 2012-08-03 at 15:06 +0800, Huacai Chen wrote:
> 1, Handle io prot correctly for MIPS.
> 2, Define SAREA_MAX as the size of one page.
> 3, Include swiotlb.h if SWIOTLB configured.
>
> Signed-off-by: Huacai Chen <chenhc@...ote.com>
> Signed-off-by: Hongliang Tao <taohl@...ote.com>
> Signed-off-by: Hua Yan <yanh@...ote.com>
> Cc: dri-devel@...ts.freedesktop.org
> ---
> drivers/gpu/drm/drm_vm.c | 2 +-
> drivers/gpu/drm/radeon/radeon_ttm.c | 4 ++++
> drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +-
> include/drm/drm_sarea.h | 2 ++
> 4 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
> index 961ee08..3f06166 100644
> --- a/drivers/gpu/drm/drm_vm.c
> +++ b/drivers/gpu/drm/drm_vm.c
> @@ -62,7 +62,7 @@ static pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
> tmp = pgprot_writecombine(tmp);
> else
> tmp = pgprot_noncached(tmp);
> -#elif defined(__sparc__) || defined(__arm__)
> +#elif defined(__sparc__) || defined(__arm__) || defined(__mips__)
> tmp = pgprot_noncached(tmp);
> #endif
> return tmp;
> 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 <linux/swiotlb.h>
> +#endif
> +
> #define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
>
> static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
> diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
> index f8187ea..0df71ea 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo_util.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
> @@ -472,7 +472,7 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp)
> else
> tmp = pgprot_noncached(tmp);
> #endif
> -#if defined(__sparc__)
> +#if defined(__sparc__) || defined(__mips__)
> if (!(caching_flags & TTM_PL_FLAG_CACHED))
> tmp = pgprot_noncached(tmp);
> #endif
> diff --git a/include/drm/drm_sarea.h b/include/drm/drm_sarea.h
> index ee5389d..1d1a858 100644
> --- a/include/drm/drm_sarea.h
> +++ b/include/drm/drm_sarea.h
> @@ -37,6 +37,8 @@
> /* SAREA area needs to be at least a page */
> #if defined(__alpha__)
> #define SAREA_MAX 0x2000U
> +#elif defined(__mips__)
> +#define SAREA_MAX 0x4000U
> #elif defined(__ia64__)
> #define SAREA_MAX 0x10000U /* 64kB */
> #else
This should be four separate patches.
--
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 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