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

Commit a5b8aad5 authored by Leo Li's avatar Leo Li Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: Check BO's requested pinning domains against its preferred_domains 



commit f5ba14043621f4afdf3ad5f92ee2d8dbebbe4340 upstream.

When pinning a buffer, we should check to see if there are any
additional restrictions imposed by bo->preferred_domains. This will
prevent the BO from being moved to an invalid domain when pinning.

For example, this can happen if the user requests to create a BO in GTT
domain for display scanout. amdgpu_dm will allow pinning to either VRAM
or GTT domains, since DCN can scanout from either or. However, in
amdgpu_bo_pin_restricted(), pinning to VRAM is preferred if there is
adequate carveout. This can lead to pinning to VRAM despite the user
requesting GTT placement for the BO.

v2: Allow the kernel to override the domain, which can happen when
    exporting a BO to a V4L camera (for example).

Signed-off-by: default avatarLeo Li <sunpeng.li@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8afbf206

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

+4 −0
Original line number Diff line number Diff line
@@ -892,6 +892,10 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, 
	if (WARN_ON_ONCE(min_offset > max_offset))

		return -EINVAL;



	/* Check domain to be pinned to against preferred domains */

	if (bo->preferred_domains & domain)

		domain = bo->preferred_domains & domain;



	/* A shared bo cannot be migrated to VRAM */

	if (bo->prime_shared_count) {

		if (domain & AMDGPU_GEM_DOMAIN_GTT)