diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/0374-drm-amdgpu-add-amdgpu_vm_entries_mask-v2.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/0374-drm-amdgpu-add-amdgpu_vm_entries_mask-v2.patch | 98 |
1 files changed, 98 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0374-drm-amdgpu-add-amdgpu_vm_entries_mask-v2.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0374-drm-amdgpu-add-amdgpu_vm_entries_mask-v2.patch new file mode 100644 index 00000000..3a993547 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0374-drm-amdgpu-add-amdgpu_vm_entries_mask-v2.patch @@ -0,0 +1,98 @@ +From 312676171fee683c7aa9d744f84f270e10a033eb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Sat, 15 Sep 2018 10:02:13 +0200 +Subject: [PATCH 0374/2940] drm/amdgpu: add amdgpu_vm_entries_mask v2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We can't get the mask for the root directory from the number of entries. + +So add a new function to avoid that problem. + +v2: fix typo in mask + +Change-Id: Ib64a52ae3fc5245adcd7c71baaa32a1657266f80 +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Huang Rui <ray.huang@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 34 ++++++++++++++++++++------ + 1 file changed, 27 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +index 074dd33d4f74..f6e413f69e2d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -190,6 +190,26 @@ static unsigned amdgpu_vm_num_entries(struct amdgpu_device *adev, + return AMDGPU_VM_PTE_COUNT(adev); + } + ++/** ++ * amdgpu_vm_entries_mask - the mask to get the entry number of a PD/PT ++ * ++ * @adev: amdgpu_device pointer ++ * @level: VMPT level ++ * ++ * Returns: ++ * The mask to extract the entry number of a PD/PT from an address. ++ */ ++static uint32_t amdgpu_vm_entries_mask(struct amdgpu_device *adev, ++ unsigned int level) ++{ ++ if (level <= adev->vm_manager.root_level) ++ return 0xffffffff; ++ else if (level != AMDGPU_VM_PTB) ++ return 0x1ff; ++ else ++ return AMDGPU_VM_PTE_COUNT(adev) - 1; ++} ++ + /** + * amdgpu_vm_bo_size - returns the size of the BOs in bytes + * +@@ -399,17 +419,17 @@ static void amdgpu_vm_pt_start(struct amdgpu_device *adev, + static bool amdgpu_vm_pt_descendant(struct amdgpu_device *adev, + struct amdgpu_vm_pt_cursor *cursor) + { +- unsigned num_entries, shift, idx; ++ unsigned mask, shift, idx; + + if (!cursor->entry->entries) + return false; + + BUG_ON(!cursor->entry->base.bo); +- num_entries = amdgpu_vm_num_entries(adev, cursor->level); ++ mask = amdgpu_vm_entries_mask(adev, cursor->level); + shift = amdgpu_vm_level_shift(adev, cursor->level); + + ++cursor->level; +- idx = (cursor->pfn >> shift) % num_entries; ++ idx = (cursor->pfn >> shift) & mask; + cursor->parent = cursor->entry; + cursor->entry = &cursor->entry->entries[idx]; + return true; +@@ -1586,7 +1606,7 @@ static int amdgpu_vm_update_ptes(struct amdgpu_pte_update_params *params, + amdgpu_vm_pt_start(adev, params->vm, start, &cursor); + while (cursor.pfn < end) { + struct amdgpu_bo *pt = cursor.entry->base.bo; +- unsigned shift, parent_shift, num_entries; ++ unsigned shift, parent_shift, mask; + uint64_t incr, entry_end, pe_start; + + if (!pt) +@@ -1641,9 +1661,9 @@ static int amdgpu_vm_update_ptes(struct amdgpu_pte_update_params *params, + + /* Looks good so far, calculate parameters for the update */ + incr = AMDGPU_GPU_PAGE_SIZE << shift; +- num_entries = amdgpu_vm_num_entries(adev, cursor.level); +- pe_start = ((cursor.pfn >> shift) & (num_entries - 1)) * 8; +- entry_end = num_entries << shift; ++ mask = amdgpu_vm_entries_mask(adev, cursor.level); ++ pe_start = ((cursor.pfn >> shift) & mask) * 8; ++ entry_end = (mask + 1) << shift; + entry_end += cursor.pfn & ~(entry_end - 1); + entry_end = min(entry_end, end); + +-- +2.17.1 + |