diff options
| author | Huacai Chen <chenhuacai@gmail.com> | 2012-08-11 11:32:17 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-08-24 01:41:05 +0200 |
| commit | 04cf55e1fa5ff0c83756b803a47cb6bd0b39f38b (patch) | |
| tree | ef230ad799d97828d4dfe985878f15b4d5718c1d /drivers/gpu | |
| parent | drm: remove the raw_edid field from struct drm_display_info (diff) | |
| download | linux-04cf55e1fa5ff0c83756b803a47cb6bd0b39f38b.tar.xz linux-04cf55e1fa5ff0c83756b803a47cb6bd0b39f38b.zip | |
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/gpu')
| -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) 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/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) 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 |