diff options
author | Dave Airlie <airlied@redhat.com> | 2016-05-09 13:49:56 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-05-09 13:49:56 +1000 |
commit | bafb86f5bc3173479002555dea7f31d943b12332 (patch) | |
tree | 6ec94c96460faf782cdb8781339560e13e0918b0 /include/drm | |
parent | ba391646d0d43aee3596b616113cce0f22dde627 (diff) | |
parent | 44549e8f5eea4e0a41b487b63e616cb089922b99 (diff) | |
download | op-kernel-dev-bafb86f5bc3173479002555dea7f31d943b12332.zip op-kernel-dev-bafb86f5bc3173479002555dea7f31d943b12332.tar.gz |
Merge tag 'v4.6-rc7' into drm-next
Merge this back as we've built up a fair few conflicts, and I have
some newer trees to pull in.
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drm_cache.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/drm_cache.h b/include/drm/drm_cache.h index 461a055..cebecff 100644 --- a/include/drm/drm_cache.h +++ b/include/drm/drm_cache.h @@ -39,6 +39,8 @@ static inline bool drm_arch_can_wc_memory(void) { #if defined(CONFIG_PPC) && !defined(CONFIG_NOT_COHERENT_CACHE) return false; +#elif defined(CONFIG_MIPS) && defined(CONFIG_CPU_LOONGSON3) + return false; #else return true; #endif |