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

Commit 7c105b06 authored by Christian König's avatar Christian König Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: fix amdgpu_bo_pin_restricted VRAM placing v2 



commit 78d0e182b6c1f5336f6e8cbb197f403276dabc7f upstream.

We could pin BOs into invisible VRAM otherwise.

v2: make logic more readable as suggested by Michel

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v1)
Reviewed-by: Rex Zhu <Rex.Zhu@amd.com> (v1)
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 17ab2f11

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

+2 −1
Original line number Diff line number Diff line
@@ -399,7 +399,8 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, 
		}

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

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

		if (lpfn && lpfn < bo->placements[i].lpfn)

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

		    (lpfn && lpfn < bo->placements[i].lpfn))

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

		bo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT;

	}