aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3815-drm-amdgpu-cleanup-coding-style-in-the-VM-code-a-bit.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3815-drm-amdgpu-cleanup-coding-style-in-the-VM-code-a-bit.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3815-drm-amdgpu-cleanup-coding-style-in-the-VM-code-a-bit.patch147
1 files changed, 147 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3815-drm-amdgpu-cleanup-coding-style-in-the-VM-code-a-bit.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3815-drm-amdgpu-cleanup-coding-style-in-the-VM-code-a-bit.patch
new file mode 100644
index 00000000..8472ff83
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3815-drm-amdgpu-cleanup-coding-style-in-the-VM-code-a-bit.patch
@@ -0,0 +1,147 @@
+From de52b6116c3311ad8e8fb3e15b48869fde127a5f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+Date: Fri, 13 Sep 2019 12:12:40 +0200
+Subject: [PATCH 3815/4256] drm/amdgpu: cleanup coding style in the VM code a
+ bit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+No functional change.
+
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 52 +++++++++++++++++---------
+ 1 file changed, 34 insertions(+), 18 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+index 05c6ef31bb06..6cda76591973 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+@@ -130,7 +130,8 @@ static unsigned amdgpu_vm_num_entries(struct amdgpu_device *adev,
+
+ if (level == adev->vm_manager.root_level)
+ /* For the root directory */
+- return round_up(adev->vm_manager.max_pfn, 1ULL << shift) >> shift;
++ return round_up(adev->vm_manager.max_pfn, 1ULL << shift)
++ >> shift;
+ else if (level != AMDGPU_VM_PTB)
+ /* Everything in between */
+ return 512;
+@@ -565,6 +566,14 @@ void amdgpu_vm_get_pd_bo(struct amdgpu_vm *vm,
+ list_add(&entry->tv.head, validated);
+ }
+
++/**
++ * amdgpu_vm_del_from_lru_notify - update bulk_moveable flag
++ *
++ * @bo: BO which was removed from the LRU
++ *
++ * Make sure the bulk_moveable flag is updated when a BO is removed from the
++ * LRU.
++ */
+ void amdgpu_vm_del_from_lru_notify(struct ttm_buffer_object *bo)
+ {
+ struct amdgpu_bo *abo;
+@@ -1023,7 +1032,8 @@ bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
+ * Returns:
+ * 0 on success, errno otherwise.
+ */
+-int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, bool need_pipe_sync)
++int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job,
++ bool need_pipe_sync)
+ {
+ struct amdgpu_device *adev = ring->adev;
+ unsigned vmhub = ring->funcs->vmhub;
+@@ -1678,8 +1688,7 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev,
+ * Returns:
+ * 0 for success, -EINVAL for failure.
+ */
+-int amdgpu_vm_bo_update(struct amdgpu_device *adev,
+- struct amdgpu_bo_va *bo_va,
++int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va,
+ bool clear)
+ {
+ struct amdgpu_bo *bo = bo_va->base.bo;
+@@ -1750,7 +1759,8 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev,
+ if (bo && bo->tbo.resv == vm->root.base.bo->tbo.resv) {
+ uint32_t mem_type = bo->tbo.mem.mem_type;
+
+- if (!(bo->preferred_domains & amdgpu_mem_type_to_domain(mem_type)))
++ if (!(bo->preferred_domains &
++ amdgpu_mem_type_to_domain(mem_type)))
+ amdgpu_vm_bo_evicted(&bo_va->base);
+ else
+ amdgpu_vm_bo_idle(&bo_va->base);
+@@ -2712,7 +2722,8 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
+ }
+ DRM_DEBUG_DRIVER("VM update mode is %s\n",
+ vm->use_cpu_for_update ? "CPU" : "SDMA");
+- WARN_ONCE((vm->use_cpu_for_update && !amdgpu_gmc_vram_full_visible(&adev->gmc)),
++ WARN_ONCE((vm->use_cpu_for_update &&
++ !amdgpu_gmc_vram_full_visible(&adev->gmc)),
+ "CPU update of VM recommended only for large BAR system\n");
+
+ if (vm->use_cpu_for_update)
+@@ -2830,7 +2841,8 @@ static int amdgpu_vm_check_clean_reserved(struct amdgpu_device *adev,
+ * Returns:
+ * 0 for success, -errno for errors.
+ */
+-int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, unsigned int pasid)
++int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm,
++ unsigned int pasid)
+ {
+ bool pte_support_ats = (adev->asic_type == CHIP_RAVEN);
+ int r;
+@@ -2873,7 +2885,8 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, uns
+ AMDGPU_VM_USE_CPU_FOR_COMPUTE);
+ DRM_DEBUG_DRIVER("VM update mode is %s\n",
+ vm->use_cpu_for_update ? "CPU" : "SDMA");
+- WARN_ONCE((vm->use_cpu_for_update && !amdgpu_gmc_vram_full_visible(&adev->gmc)),
++ WARN_ONCE((vm->use_cpu_for_update &&
++ !amdgpu_gmc_vram_full_visible(&adev->gmc)),
+ "CPU update of VM recommended only for large BAR system\n");
+
+ if (vm->use_cpu_for_update)
+@@ -3079,8 +3092,9 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
+
+ switch (args->in.op) {
+ case AMDGPU_VM_OP_RESERVE_VMID:
+- /* current, we only have requirement to reserve vmid from gfxhub */
+- r = amdgpu_vmid_alloc_reserved(adev, &fpriv->vm, AMDGPU_GFXHUB_0);
++ /* We only have requirement to reserve vmid from gfxhub */
++ r = amdgpu_vmid_alloc_reserved(adev, &fpriv->vm,
++ AMDGPU_GFXHUB_0);
+ if (r)
+ return r;
+ break;
+@@ -3123,15 +3137,17 @@ void amdgpu_vm_get_task_info(struct amdgpu_device *adev, unsigned int pasid,
+ */
+ void amdgpu_vm_set_task_info(struct amdgpu_vm *vm)
+ {
+- if (!vm->task_info.pid) {
+- vm->task_info.pid = current->pid;
+- get_task_comm(vm->task_info.task_name, current);
++ if (vm->task_info.pid)
++ return;
+
+- if (current->group_leader->mm == current->mm) {
+- vm->task_info.tgid = current->group_leader->pid;
+- get_task_comm(vm->task_info.process_name, current->group_leader);
+- }
+- }
++ vm->task_info.pid = current->pid;
++ get_task_comm(vm->task_info.task_name, current);
++
++ if (current->group_leader->mm != current->mm)
++ return;
++
++ vm->task_info.tgid = current->group_leader->pid;
++ get_task_comm(vm->task_info.process_name, current->group_leader);
+ }
+
+ /**
+--
+2.17.1
+