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

Commit ebc8d835 authored by Madhav Chauhan's avatar Madhav Chauhan Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: don't map BO in reserved region 



commit c4aa8dff6091cc9536aeb255e544b0b4ba29faf4 upstream.

2MB area is reserved at top inside VM.

Suggested-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarMadhav Chauhan <madhav.chauhan@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 b37b5ced

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

+10 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 
	struct ww_acquire_ctx ticket;

	struct list_head list, duplicates;

	uint64_t va_flags;

	uint64_t vm_size;

	int r = 0;



	if (args->va_address < AMDGPU_VA_RESERVED_SIZE) {
@@ -583,6 +584,15 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 


	args->va_address &= AMDGPU_VA_HOLE_MASK;



	vm_size = adev->vm_manager.max_pfn * AMDGPU_GPU_PAGE_SIZE;

	vm_size -= AMDGPU_VA_RESERVED_SIZE;

	if (args->va_address + args->map_size > vm_size) {

		dev_dbg(&dev->pdev->dev,

			"va_address 0x%llx is in top reserved area 0x%llx\n",

			args->va_address + args->map_size, vm_size);

		return -EINVAL;

	}



	if ((args->flags & ~valid_flags) && (args->flags & ~prt_flags)) {

		dev_dbg(&dev->pdev->dev, "invalid flags combination 0x%08X\n",

			args->flags);