Attachment 140257 Details for Bug 106258 – drm/amdgpu: GPU vs CPU page size fixes in amdgpu_vm_bo_split_mapping

[patch] drm/amdgpu: GPU vs CPU page size fixes in amdgpu_vm_bo_split_mapping

0001-drm-amdgpu-GPU-vs-CPU-page-size-fixes-in-amdgpu_vm_b.patch (text/plain), 1.70 KB, created by Michel Dänzer on 2018-06-21 09:29:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2018-06-21 09:29:57 UTC

Size: 1.70 KB

patch

obsolete

>From 922b6df1394af4cf30736af76a0b4648b951e1c3 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
>Date: Thu, 21 Jun 2018 11:27:46 +0200
>Subject: [PATCH] drm/amdgpu: GPU vs CPU page size fixes in
> amdgpu_vm_bo_split_mapping
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>start / last / max_entries are numbers of GPU pages, pfn / count are
>numbers of CPU pages.
>
>---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>index 819949418495..422d1a434db4 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>@@ -1577,7 +1577,9 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev,
> 			uint64_t count;
> 
> 			max_entries = min(max_entries, 16ull * 1024ull);
>-			for (count = 1; count < max_entries; ++count) {
>+			for (count = 1;
>+			     count < max_entries / (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE);
>+			     ++count) {
> 				uint64_t idx = pfn + count;
> 
> 				if (pages_addr[idx] !=
>@@ -1590,7 +1592,7 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev,
> 				dma_addr = pages_addr;
> 			} else {
> 				addr = pages_addr[pfn];
>-				max_entries = count;
>+				max_entries = count * (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE);
> 			}
> 
> 		} else if (flags & AMDGPU_PTE_VALID) {
>@@ -1605,7 +1607,7 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev,
> 		if (r)
> 			return r;
> 
>-		pfn += last - start + 1;
>+		pfn += (last - start + 1) / (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE);
> 		if (nodes && nodes->size == pfn) {
> 			pfn = 0;
> 			++nodes;
>-- 
>2.17.1
>

Actions: View | Splinter Review

Attachments on bug 106258: 140046 | 140208 | 140239 | 140252 | 140253 | 140257

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.