diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-02-08 10:16:55 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-02-08 10:16:55 +0300 |
| commit | c9e9daccc7a6a670a6619723138ace6752f4773b (patch) | |
| tree | ed38356575314aec55deda66ef856a9bfeaaf282 /drivers/gpu/drm/radeon/radeon_object.c | |
| parent | 1f5e35636cc2737ccf1f67815cb33b978621f0f6 (diff) | |
| parent | ddce57a6f0a2d8d1bfacfa77f06043bc760403c2 (diff) | |
| download | linux-c9e9daccc7a6a670a6619723138ace6752f4773b.tar.xz | |
Merge branch 'topic/core-fixes' into for-next
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_object.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 84d45633d28c..fb6ad143873f 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -33,6 +33,7 @@ #include <linux/slab.h> #include <drm/drmP.h> #include <drm/radeon_drm.h> +#include <drm/drm_cache.h> #include "radeon.h" #include "radeon_trace.h" @@ -245,6 +246,12 @@ int radeon_bo_create(struct radeon_device *rdev, DRM_INFO_ONCE("Please enable CONFIG_MTRR and CONFIG_X86_PAT for " "better performance thanks to write-combining\n"); bo->flags &= ~(RADEON_GEM_GTT_WC | RADEON_GEM_GTT_UC); +#else + /* For architectures that don't support WC memory, + * mask out the WC flag from the BO + */ + if (!drm_arch_can_wc_memory()) + bo->flags &= ~RADEON_GEM_GTT_WC; #endif radeon_ttm_placement_from_domain(bo, domain); |