Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09980771 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents 545036a9 27b94b4f

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -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))