[PATCH 3/3] drm/amdgpu: Move csa related functions to separate file
Christian König
ckoenig.leichtzumerken at gmail.com
Tue Oct 16 10:49:00 UTC 2018
Am 16.10.2018 um 11:25 schrieb Rex Zhu:
> Those functions can be shared between SRIOV and baremetal
Please drop the _manager suffix from the filename, apart from that the
patches look good to me.
Christian.
>
> Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/Makefile | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 +
> drivers/gpu/drm/amd/amdgpu/amdgpu_csa_manager.c | 117 ++++++++++++++++++++++++
> drivers/gpu/drm/amd/amdgpu/amdgpu_csa_manager.h | 40 ++++++++
> drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 92 -------------------
> drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 7 --
> 6 files changed, 159 insertions(+), 100 deletions(-)
> create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_csa_manager.c
> create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_csa_manager.h
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile
> index 138cb78..0533d69 100644
> --- a/drivers/gpu/drm/amd/amdgpu/Makefile
> +++ b/drivers/gpu/drm/amd/amdgpu/Makefile
> @@ -53,7 +53,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \
> amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \
> amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \
> amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \
> - amdgpu_gmc.o amdgpu_xgmi.o
> + amdgpu_gmc.o amdgpu_xgmi.o amdgpu_csa_manager.o
>
> # add asic specific block
> amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index 8cd301f..eb2afe4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -75,6 +75,7 @@
> #include "amdgpu_sdma.h"
> #include "amdgpu_dm.h"
> #include "amdgpu_virt.h"
> +#include "amdgpu_csa_manager.h"
> #include "amdgpu_gart.h"
> #include "amdgpu_debugfs.h"
> #include "amdgpu_job.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa_manager.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa_manager.c
> new file mode 100644
> index 0000000..7d0cc19
> --- /dev/null
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa_manager.c
> @@ -0,0 +1,117 @@
> +/*
> + * Copyright 2016 Advanced Micro Devices, Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> +
> + * * Author: Monk.liu at amd.com
> + */
> +
> +#include "amdgpu.h"
> +
> +uint64_t amdgpu_csa_vaddr(struct amdgpu_device *adev)
> +{
> + uint64_t addr = adev->vm_manager.max_pfn << AMDGPU_GPU_PAGE_SHIFT;
> +
> + addr -= AMDGPU_VA_RESERVED_SIZE;
> + addr = amdgpu_gmc_sign_extend(addr);
> +
> + return addr;
> +}
> +
> +int amdgpu_allocate_static_csa(struct amdgpu_device *adev, struct amdgpu_bo *bo,
> + uint32_t size)
> +{
> + int r;
> + void *ptr;
> +
> + r = amdgpu_bo_create_kernel(adev, size, PAGE_SIZE,
> + AMDGPU_GEM_DOMAIN_VRAM, &bo,
> + NULL, &ptr);
> + if (!bo)
> + return -ENOMEM;
> +
> + memset(ptr, 0, size);
> + return 0;
> +}
> +
> +void amdgpu_free_static_csa(struct amdgpu_bo *bo)
> +{
> + amdgpu_bo_free_kernel(&bo, NULL, NULL);
> +}
> +
> +/*
> + * amdgpu_map_static_csa should be called during amdgpu_vm_init
> + * it maps virtual address amdgpu_csa_vaddr() to this VM, and each command
> + * submission of GFX should use this virtual address within META_DATA init
> + * package to support SRIOV gfx preemption.
> + */
> +int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm,
> + struct amdgpu_bo *bo, struct amdgpu_bo_va **bo_va,
> + uint64_t csa_addr)
> +{
> + struct ww_acquire_ctx ticket;
> + struct list_head list;
> + struct amdgpu_bo_list_entry pd;
> + struct ttm_validate_buffer csa_tv;
> + int r;
> +
> + INIT_LIST_HEAD(&list);
> + INIT_LIST_HEAD(&csa_tv.head);
> + csa_tv.bo = &bo->tbo;
> + csa_tv.shared = true;
> +
> + list_add(&csa_tv.head, &list);
> + amdgpu_vm_get_pd_bo(vm, &list, &pd);
> +
> + r = ttm_eu_reserve_buffers(&ticket, &list, true, NULL);
> + if (r) {
> + DRM_ERROR("failed to reserve CSA,PD BOs: err=%d\n", r);
> + return r;
> + }
> +
> + *bo_va = amdgpu_vm_bo_add(adev, vm, bo);
> + if (!*bo_va) {
> + ttm_eu_backoff_reservation(&ticket, &list);
> + DRM_ERROR("failed to create bo_va for static CSA\n");
> + return -ENOMEM;
> + }
> +
> + r = amdgpu_vm_alloc_pts(adev, (*bo_va)->base.vm, csa_addr,
> + AMDGPU_CSA_SIZE);
> + if (r) {
> + DRM_ERROR("failed to allocate pts for static CSA, err=%d\n", r);
> + amdgpu_vm_bo_rmv(adev, *bo_va);
> + ttm_eu_backoff_reservation(&ticket, &list);
> + return r;
> + }
> +
> + r = amdgpu_vm_bo_map(adev, *bo_va, csa_addr, 0, AMDGPU_CSA_SIZE,
> + AMDGPU_PTE_READABLE | AMDGPU_PTE_WRITEABLE |
> + AMDGPU_PTE_EXECUTABLE);
> +
> + if (r) {
> + DRM_ERROR("failed to do bo_map on static CSA, err=%d\n", r);
> + amdgpu_vm_bo_rmv(adev, *bo_va);
> + ttm_eu_backoff_reservation(&ticket, &list);
> + return r;
> + }
> +
> + ttm_eu_backoff_reservation(&ticket, &list);
> + return 0;
> +}
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa_manager.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa_manager.h
> new file mode 100644
> index 0000000..a2cd8ca
> --- /dev/null
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa_manager.h
> @@ -0,0 +1,40 @@
> +/*
> + * Copyright 2016 Advanced Micro Devices, Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + *
> + * Author: Monk.liu at amd.com
> + */
> +
> +#ifndef AMDGPU_CSA_MANAGER_H
> +#define AMDGPU_CSA_MANAGER_H
> +
> +#define AMDGPU_SDMA_CSA_SIZE (1024)
> +#define AMDGPU_CSA_SIZE (8 * 1024)
> +
> +
> +uint64_t amdgpu_csa_vaddr(struct amdgpu_device *adev);
> +int amdgpu_allocate_static_csa(struct amdgpu_device *adev, struct amdgpu_bo *bo,
> + uint32_t size);
> +int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm,
> + struct amdgpu_bo *bo,
> + struct amdgpu_bo_va **bo_va, uint64_t csa_addr);
> +void amdgpu_free_static_csa(struct amdgpu_bo *bo);
> +
> +#endif
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> index e4f2901..cca794a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> @@ -23,16 +23,6 @@
>
> #include "amdgpu.h"
>
> -uint64_t amdgpu_csa_vaddr(struct amdgpu_device *adev)
> -{
> - uint64_t addr = adev->vm_manager.max_pfn << AMDGPU_GPU_PAGE_SHIFT;
> -
> - addr -= AMDGPU_VA_RESERVED_SIZE;
> - addr = amdgpu_gmc_sign_extend(addr);
> -
> - return addr;
> -}
> -
> bool amdgpu_virt_mmio_blocked(struct amdgpu_device *adev)
> {
> /* By now all MMIO pages except mailbox are blocked */
> @@ -41,88 +31,6 @@ bool amdgpu_virt_mmio_blocked(struct amdgpu_device *adev)
> return RREG32_NO_KIQ(0xc040) == 0xffffffff;
> }
>
> -int amdgpu_allocate_static_csa(struct amdgpu_device *adev, struct amdgpu_bo *bo,
> - uint32_t size)
> -{
> - int r;
> - void *ptr;
> -
> - r = amdgpu_bo_create_kernel(adev, size, PAGE_SIZE,
> - AMDGPU_GEM_DOMAIN_VRAM, &bo,
> - NULL, &ptr);
> - if (!bo)
> - return -ENOMEM;
> -
> - memset(ptr, 0, size);
> - return 0;
> -}
> -
> -void amdgpu_free_static_csa(struct amdgpu_bo *bo)
> -{
> - amdgpu_bo_free_kernel(&bo, NULL, NULL);
> -}
> -
> -/*
> - * amdgpu_map_static_csa should be called during amdgpu_vm_init
> - * it maps virtual address amdgpu_csa_vaddr() to this VM, and each command
> - * submission of GFX should use this virtual address within META_DATA init
> - * package to support SRIOV gfx preemption.
> - */
> -int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm,
> - struct amdgpu_bo *bo, struct amdgpu_bo_va **bo_va,
> - uint64_t csa_addr)
> -{
> - struct ww_acquire_ctx ticket;
> - struct list_head list;
> - struct amdgpu_bo_list_entry pd;
> - struct ttm_validate_buffer csa_tv;
> - int r;
> -
> - INIT_LIST_HEAD(&list);
> - INIT_LIST_HEAD(&csa_tv.head);
> - csa_tv.bo = &bo->tbo;
> - csa_tv.shared = true;
> -
> - list_add(&csa_tv.head, &list);
> - amdgpu_vm_get_pd_bo(vm, &list, &pd);
> -
> - r = ttm_eu_reserve_buffers(&ticket, &list, true, NULL);
> - if (r) {
> - DRM_ERROR("failed to reserve CSA,PD BOs: err=%d\n", r);
> - return r;
> - }
> -
> - *bo_va = amdgpu_vm_bo_add(adev, vm, bo);
> - if (!*bo_va) {
> - ttm_eu_backoff_reservation(&ticket, &list);
> - DRM_ERROR("failed to create bo_va for static CSA\n");
> - return -ENOMEM;
> - }
> -
> - r = amdgpu_vm_alloc_pts(adev, (*bo_va)->base.vm, csa_addr,
> - AMDGPU_CSA_SIZE);
> - if (r) {
> - DRM_ERROR("failed to allocate pts for static CSA, err=%d\n", r);
> - amdgpu_vm_bo_rmv(adev, *bo_va);
> - ttm_eu_backoff_reservation(&ticket, &list);
> - return r;
> - }
> -
> - r = amdgpu_vm_bo_map(adev, *bo_va, csa_addr, 0, AMDGPU_CSA_SIZE,
> - AMDGPU_PTE_READABLE | AMDGPU_PTE_WRITEABLE |
> - AMDGPU_PTE_EXECUTABLE);
> -
> - if (r) {
> - DRM_ERROR("failed to do bo_map on static CSA, err=%d\n", r);
> - amdgpu_vm_bo_rmv(adev, *bo_va);
> - ttm_eu_backoff_reservation(&ticket, &list);
> - return r;
> - }
> -
> - ttm_eu_backoff_reservation(&ticket, &list);
> - return 0;
> -}
> -
> void amdgpu_virt_init_setting(struct amdgpu_device *adev)
> {
> /* enable virtual display */
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
> index c124799..e1c1de0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
> @@ -278,14 +278,7 @@ static inline bool is_virtual_machine(void)
>
> struct amdgpu_vm;
>
> -uint64_t amdgpu_csa_vaddr(struct amdgpu_device *adev);
> bool amdgpu_virt_mmio_blocked(struct amdgpu_device *adev);
> -int amdgpu_allocate_static_csa(struct amdgpu_device *adev, struct amdgpu_bo *bo,
> - uint32_t size);
> -int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm,
> - struct amdgpu_bo *bo,
> - struct amdgpu_bo_va **bo_va, uint64_t csa_addr);
> -void amdgpu_free_static_csa(struct amdgpu_bo *bo);
> void amdgpu_virt_init_setting(struct amdgpu_device *adev);
> uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg);
> void amdgpu_virt_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v);
More information about the amd-gfx
mailing list