[PATCH 6/6] drm/amdgpu: remove AMDGPU_GEM_CREATE_SHADOW flag

[Christian König]

Am 22.04.21 um 17:40 schrieb Nirmoy Das:
> Remove unused AMDGPU_GEM_CREATE_SHADOW flag.

Please add "Userspace as never allowed to use this." to the commit message.

Christian.

>
> Signed-off-by: Nirmoy Das <nirmoy.das at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 +----
>   include/uapi/drm/amdgpu_drm.h              | 2 --
>   2 files changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index 39f88e4a8eb5..da6d4ee0a132 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -649,8 +649,7 @@ int amdgpu_bo_create_shadow(struct amdgpu_device *adev,
>   	memset(&bp, 0, sizeof(bp));
>   	bp.size = size;
>   	bp.domain = AMDGPU_GEM_DOMAIN_GTT;
> -	bp.flags = AMDGPU_GEM_CREATE_CPU_GTT_USWC |
> -		AMDGPU_GEM_CREATE_SHADOW;
> +	bp.flags = AMDGPU_GEM_CREATE_CPU_GTT_USWC;
>   	bp.type = ttm_bo_type_kernel;
>   	bp.resv = bo->tbo.base.resv;
>   	bp.bo_ptr_size = sizeof(struct amdgpu_bo);
> @@ -685,7 +684,6 @@ int amdgpu_bo_create_user(struct amdgpu_device *adev,
>   	struct amdgpu_bo *bo_ptr;
>   	int r;
>   
> -	bp->flags = bp->flags & ~AMDGPU_GEM_CREATE_SHADOW;
>   	bp->bo_ptr_size = sizeof(struct amdgpu_bo_user);
>   	r = amdgpu_bo_create(adev, bp, &bo_ptr);
>   	if (r)
> @@ -1559,7 +1557,6 @@ u64 amdgpu_bo_print_info(int id, struct amdgpu_bo *bo, struct seq_file *m)
>   	amdgpu_bo_print_flag(m, bo, NO_CPU_ACCESS);
>   	amdgpu_bo_print_flag(m, bo, CPU_GTT_USWC);
>   	amdgpu_bo_print_flag(m, bo, VRAM_CLEARED);
> -	amdgpu_bo_print_flag(m, bo, SHADOW);
>   	amdgpu_bo_print_flag(m, bo, VRAM_CONTIGUOUS);
>   	amdgpu_bo_print_flag(m, bo, VM_ALWAYS_VALID);
>   	amdgpu_bo_print_flag(m, bo, EXPLICIT_SYNC);
> diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
> index 8b832f7458f2..9169df7fadee 100644
> --- a/include/uapi/drm/amdgpu_drm.h
> +++ b/include/uapi/drm/amdgpu_drm.h
> @@ -119,8 +119,6 @@ extern "C" {
>   #define AMDGPU_GEM_CREATE_CPU_GTT_USWC		(1 << 2)
>   /* Flag that the memory should be in VRAM and cleared */
>   #define AMDGPU_GEM_CREATE_VRAM_CLEARED		(1 << 3)
> -/* Flag that create shadow bo(GTT) while allocating vram bo */
> -#define AMDGPU_GEM_CREATE_SHADOW		(1 << 4)
>   /* Flag that allocating the BO should use linear VRAM */
>   #define AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS	(1 << 5)
>   /* Flag that BO is always valid in this VM */