diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index f5e17f95e812..992b7f5843bc 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |||
@@ -132,10 +132,7 @@ void amdgpu_ttm_placement_from_domain(struct amdgpu_bo *rbo, u32 domain) | |||
132 | } | 132 | } |
133 | 133 | ||
134 | if (domain & AMDGPU_GEM_DOMAIN_GTT) { | 134 | if (domain & AMDGPU_GEM_DOMAIN_GTT) { |
135 | if (rbo->flags & AMDGPU_GEM_CREATE_CPU_GTT_UC) { | 135 | if (rbo->flags & AMDGPU_GEM_CREATE_CPU_GTT_USWC) { |
136 | rbo->placements[c].fpfn = 0; | ||
137 | rbo->placements[c++].flags = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_TT; | ||
138 | } else if (rbo->flags & AMDGPU_GEM_CREATE_CPU_GTT_WC) { | ||
139 | rbo->placements[c].fpfn = 0; | 136 | rbo->placements[c].fpfn = 0; |
140 | rbo->placements[c++].flags = TTM_PL_FLAG_WC | TTM_PL_FLAG_TT | | 137 | rbo->placements[c++].flags = TTM_PL_FLAG_WC | TTM_PL_FLAG_TT | |
141 | TTM_PL_FLAG_UNCACHED; | 138 | TTM_PL_FLAG_UNCACHED; |
@@ -146,10 +143,7 @@ void amdgpu_ttm_placement_from_domain(struct amdgpu_bo *rbo, u32 domain) | |||
146 | } | 143 | } |
147 | 144 | ||
148 | if (domain & AMDGPU_GEM_DOMAIN_CPU) { | 145 | if (domain & AMDGPU_GEM_DOMAIN_CPU) { |
149 | if (rbo->flags & AMDGPU_GEM_CREATE_CPU_GTT_UC) { | 146 | if (rbo->flags & AMDGPU_GEM_CREATE_CPU_GTT_USWC) { |
150 | rbo->placements[c].fpfn = 0; | ||
151 | rbo->placements[c++].flags = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_SYSTEM; | ||
152 | } else if (rbo->flags & AMDGPU_GEM_CREATE_CPU_GTT_WC) { | ||
153 | rbo->placements[c].fpfn = 0; | 147 | rbo->placements[c].fpfn = 0; |
154 | rbo->placements[c++].flags = TTM_PL_FLAG_WC | TTM_PL_FLAG_SYSTEM | | 148 | rbo->placements[c++].flags = TTM_PL_FLAG_WC | TTM_PL_FLAG_SYSTEM | |
155 | TTM_PL_FLAG_UNCACHED; | 149 | TTM_PL_FLAG_UNCACHED; |