diff options
author | Dave Airlie | 2017-10-13 08:23:34 +0200 |
---|---|---|
committer | Dave Airlie | 2017-10-13 08:23:34 +0200 |
commit | 09980771815545a552b3a3e05d0ed283fa013602 (patch) | |
tree | a011a3721d1fd9af8fe42577918571ee8ad26d71 /drivers/gpu | |
parent | Merge tag 'drm-misc-fixes-2017-10-11' of git://anongit.freedesktop.org/drm/dr... (diff) | |
parent | drm/amdgpu: fix placement flags in amdgpu_ttm_bind (diff) | |
download | kernel-qcow2-linux-09980771815545a552b3a3e05d0ed283fa013602.tar.gz kernel-qcow2-linux-09980771815545a552b3a3e05d0ed283fa013602.tar.xz kernel-qcow2-linux-09980771815545a552b3a3e05d0ed283fa013602.zip |
Merge branch 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
single amdgpu regression fix.
* 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu: fix placement flags in amdgpu_ttm_bind
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 7ef6c28a34d9..bc746131987f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -834,7 +834,7 @@ int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem) placement.busy_placement = &placements; placements.fpfn = 0; placements.lpfn = adev->mc.gart_size >> PAGE_SHIFT; - placements.flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT; + placements.flags = bo->mem.placement | TTM_PL_FLAG_TT; r = ttm_bo_mem_space(bo, &placement, &tmp, true, false); if (unlikely(r)) |