diff options
author | Huacai Chen <chenhuacai@gmail.com> | 2012-08-11 05:32:17 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-08-23 19:41:05 -0400 |
commit | 04cf55e1fa5ff0c83756b803a47cb6bd0b39f38b (patch) | |
tree | ef230ad799d97828d4dfe985878f15b4d5718c1d /drivers | |
parent | 451023dc32d4542c21b52ad1692e6e01cb75b099 (diff) |
drm: Handle io prot correctly for MIPS.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/drm_vm.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_util.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index 961ee08927fe..3f0616672531 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) | |||
62 | tmp = pgprot_writecombine(tmp); | 62 | tmp = pgprot_writecombine(tmp); |
63 | else | 63 | else |
64 | tmp = pgprot_noncached(tmp); | 64 | tmp = pgprot_noncached(tmp); |
65 | #elif defined(__sparc__) || defined(__arm__) | 65 | #elif defined(__sparc__) || defined(__arm__) || defined(__mips__) |
66 | tmp = pgprot_noncached(tmp); | 66 | tmp = pgprot_noncached(tmp); |
67 | #endif | 67 | #endif |
68 | return tmp; | 68 | return tmp; |
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index f8187ead7b37..0df71eacd587 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) | |||
472 | else | 472 | else |
473 | tmp = pgprot_noncached(tmp); | 473 | tmp = pgprot_noncached(tmp); |
474 | #endif | 474 | #endif |
475 | #if defined(__sparc__) | 475 | #if defined(__sparc__) || defined(__mips__) |
476 | if (!(caching_flags & TTM_PL_FLAG_CACHED)) | 476 | if (!(caching_flags & TTM_PL_FLAG_CACHED)) |
477 | tmp = pgprot_noncached(tmp); | 477 | tmp = pgprot_noncached(tmp); |
478 | #endif | 478 | #endif |