From: Lucas Stach <dev@lynxeye.de>
Date: Fri, 27 Jun 2014 11:29:09 +0000 (+0900)
Subject: drm/ttm: recognize ARM arch in ioprot handler
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2fc2dd781bec793fbc293ecc9345b233783a6382;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

drm/ttm: recognize ARM arch in ioprot handler

Nouveau can now be used on ARM, so add an ioprot handler for this
architecture.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
---

diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 1df856f78568..30e5d90cb7bc 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -500,7 +500,7 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp)
 			pgprot_val(tmp) |= _PAGE_GUARDED;
 	}
 #endif
-#if defined(__ia64__)
+#if defined(__ia64__) || defined(__arm__)
 	if (caching_flags & TTM_PL_FLAG_WC)
 		tmp = pgprot_writecombine(tmp);
 	else