diff options
author | Lucas Stach <dev@lynxeye.de> | 2014-06-27 20:29:09 +0900 |
---|---|---|
committer | David Herrmann <dh.herrmann@gmail.com> | 2014-07-08 00:34:18 +0200 |
commit | 2fc2dd781bec793fbc293ecc9345b233783a6382 (patch) | |
tree | c904afc28597b46efed8c27b4a6c5f0eacf20d23 /drivers/gpu/drm/ttm | |
parent | 6d6dfcfb883818b40b58bac61cc72cab428a7a03 (diff) | |
download | op-kernel-dev-2fc2dd781bec793fbc293ecc9345b233783a6382.zip op-kernel-dev-2fc2dd781bec793fbc293ecc9345b233783a6382.tar.gz |
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>
Diffstat (limited to 'drivers/gpu/drm/ttm')
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 1df856f..30e5d90 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 |