lkml.org 
[lkml]   [2021]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 035/122] drm/amdkfd: use allowed domain for vmbo validation
    Date
    From: Nirmoy Das <nirmoy.das@amd.com>

    [ Upstream commit bc05716d4fdd065013633602c5960a2bf1511b9c ]

    Fixes handling when page tables are in system memory.

    v3: remove struct amdgpu_vm_parser.
    v2: remove unwanted variable.
    change amdgpu_amdkfd_validate instead of amdgpu_amdkfd_bo_validate.

    Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
    Reviewed-by: Christian König <christian.koenig@amd.com>
    Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 21 ++++---------------
    1 file changed, 4 insertions(+), 17 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
    index f3fa271e3394..25af45adc03e 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
    @@ -55,12 +55,6 @@ static struct {
    spinlock_t mem_limit_lock;
    } kfd_mem_limit;

    -/* Struct used for amdgpu_amdkfd_bo_validate */
    -struct amdgpu_vm_parser {
    - uint32_t domain;
    - bool wait;
    -};
    -
    static const char * const domain_bit_to_string[] = {
    "CPU",
    "GTT",
    @@ -293,11 +287,9 @@ validate_fail:
    return ret;
    }

    -static int amdgpu_amdkfd_validate(void *param, struct amdgpu_bo *bo)
    +static int amdgpu_amdkfd_validate_vm_bo(void *_unused, struct amdgpu_bo *bo)
    {
    - struct amdgpu_vm_parser *p = param;
    -
    - return amdgpu_amdkfd_bo_validate(bo, p->domain, p->wait);
    + return amdgpu_amdkfd_bo_validate(bo, bo->allowed_domains, false);
    }

    /* vm_validate_pt_pd_bos - Validate page table and directory BOs
    @@ -311,20 +303,15 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)
    {
    struct amdgpu_bo *pd = vm->root.base.bo;
    struct amdgpu_device *adev = amdgpu_ttm_adev(pd->tbo.bdev);
    - struct amdgpu_vm_parser param;
    int ret;

    - param.domain = AMDGPU_GEM_DOMAIN_VRAM;
    - param.wait = false;
    -
    - ret = amdgpu_vm_validate_pt_bos(adev, vm, amdgpu_amdkfd_validate,
    - &param);
    + ret = amdgpu_vm_validate_pt_bos(adev, vm, amdgpu_amdkfd_validate_vm_bo, NULL);
    if (ret) {
    pr_err("amdgpu: failed to validate PT BOs\n");
    return ret;
    }

    - ret = amdgpu_amdkfd_validate(&param, pd);
    + ret = amdgpu_amdkfd_validate_vm_bo(NULL, pd);
    if (ret) {
    pr_err("amdgpu: failed to validate PD\n");
    return ret;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-15 20:43    [W:4.673 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site