]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
drm/amdgpu: minor cleanup for amdgpu_ttm_bind
authorChristian König <christian.koenig@amd.com>
Mon, 16 Oct 2017 11:47:15 +0000 (13:47 +0200)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 26 Oct 2017 03:09:39 +0000 (23:09 -0400)
Filter the placement mask before using it. In theory it could be that we
have other flags set here as well.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

index 51eacefadea11e23ddf9325e89d01671a45ef36b..b577b717caa01e20ab8f706db1c30baee2389af6 100644 (file)
@@ -909,7 +909,8 @@ 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 = bo->mem.placement | TTM_PL_FLAG_TT;
+       placements.flags = (bo->mem.placement & ~TTM_PL_MASK_MEM) |
+               TTM_PL_FLAG_TT;
 
        r = ttm_bo_mem_space(bo, &placement, &tmp, true, false);
        if (unlikely(r))