xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v4.2-rc7' into drm-next

Browse Source 
Linux 4.2-rc7

Backmerge master for i915 fixes
This commit is contained in:
Dave Airlie
2015-08-17 14:13:53 +10:00
parent 8f9cb50789 2c6625cd54
commit 4eebf60b74
825 changed files with 9359 additions and 5262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/ttm/ttm_bo_util.c
View File

@@ -490,7 +490,8 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp)
else if (boot_cpu_data.x86 > 3)
tmp = pgprot_noncached(tmp);
#endif
#if defined(__ia64__) || defined(__arm__) || defined(__powerpc__)
#if defined(__ia64__) || defined(__arm__) || defined(__aarch64__) || \
defined(__powerpc__)
if (caching_flags & TTM_PL_FLAG_WC)
tmp = pgprot_writecombine(tmp);
else