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

Commit 387f49e5 authored by Junwei Zhang's avatar Junwei Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: fix clear_all and replace handling in the VM (v2) 



v2: assign bo_va as well

We need to put the lose ends on the invalid list because it is possible
that we need to split up huge pages for them.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com> (v2)
Reviewed-by: default avatarDavid Zhou <david1.zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 23529390

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -2123,7 +2123,8 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev, 
			before->last = saddr - 1;

			before->last = saddr - 1;

			before->offset = tmp->offset;

			before->offset = tmp->offset;

			before->flags = tmp->flags;

			before->flags = tmp->flags;

			list_add(&before->list, &tmp->list);

			before->bo_va = tmp->bo_va;

			list_add(&before->list, &tmp->bo_va->invalids);

		}

		}





		/* Remember mapping split at the end */

		/* Remember mapping split at the end */
@@ -2133,7 +2134,8 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev, 
			after->offset = tmp->offset;

			after->offset = tmp->offset;

			after->offset += after->start - tmp->start;

			after->offset += after->start - tmp->start;

			after->flags = tmp->flags;

			after->flags = tmp->flags;

			list_add(&after->list, &tmp->list);

			after->bo_va = tmp->bo_va;

			list_add(&after->list, &tmp->bo_va->invalids);

		}

		}





		list_del(&tmp->list);

		list_del(&tmp->list);