diff options
author | Alexandre Courbot <acourbot@nvidia.com> | 2015-07-01 04:32:29 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-07-23 21:51:14 -0400 |
commit | f135b978c2dab3d439eacb8353d3c0aac6af072a (patch) | |
tree | f93a29fcae18b447ea456231ba5fedb8fbfdedce | |
parent | 45b4b782e8489bcf45a4331ee32f0f3037c5c3aa (diff) |
drm/ttm: recognize ARM64 arch in ioprot handler
Return proper pgprot for ARM64. This is required for objects like
Nouveau fences to be mapped with expected coherency.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 882cccdad272..ac6fe40b99f7 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c | |||
@@ -490,7 +490,8 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp) | |||
490 | else if (boot_cpu_data.x86 > 3) | 490 | else if (boot_cpu_data.x86 > 3) |
491 | tmp = pgprot_noncached(tmp); | 491 | tmp = pgprot_noncached(tmp); |
492 | #endif | 492 | #endif |
493 | #if defined(__ia64__) || defined(__arm__) || defined(__powerpc__) | 493 | #if defined(__ia64__) || defined(__arm__) || defined(__aarch64__) || \ |
494 | defined(__powerpc__) | ||
494 | if (caching_flags & TTM_PL_FLAG_WC) | 495 | if (caching_flags & TTM_PL_FLAG_WC) |
495 | tmp = pgprot_writecombine(tmp); | 496 | tmp = pgprot_writecombine(tmp); |
496 | else | 497 | else |