Commit e9c7577c authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: simplify pinning into visible VRAM 



Just set the CPU access required flag when we pin it.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c833d8aa

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

+8 −15
Original line number Diff line number Diff line
@@ -635,7 +635,6 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, 
{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

	int r, i;

	unsigned fpfn, lpfn;



	if (amdgpu_ttm_tt_get_usermm(bo->tbo.ttm))

		return -EPERM;
@@ -667,22 +666,16 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, 
	}



	bo->flags |= AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;

	/* force to pin into visible video ram */

	if (!(bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS))

		bo->flags |= AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;

	amdgpu_ttm_placement_from_domain(bo, domain);

	for (i = 0; i < bo->placement.num_placement; i++) {

		/* force to pin into visible video ram */

		if ((bo->placements[i].flags & TTM_PL_FLAG_VRAM) &&

		    !(bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS) &&

		    (!max_offset || max_offset >

		     adev->mc.visible_vram_size)) {

			if (WARN_ON_ONCE(min_offset >

					 adev->mc.visible_vram_size))

				return -EINVAL;

			fpfn = min_offset >> PAGE_SHIFT;

			lpfn = adev->mc.visible_vram_size >> PAGE_SHIFT;

		} else {

		unsigned fpfn, lpfn;



		fpfn = min_offset >> PAGE_SHIFT;

		lpfn = max_offset >> PAGE_SHIFT;

		}



		if (fpfn > bo->placements[i].fpfn)

			bo->placements[i].fpfn = fpfn;

		if (!bo->placements[i].lpfn ||

CRA Git | Maintained and supported by SUSTech CRA and CCSE