[Bug,106258] AMD Xorg start failes with non-4K page sizes
diff mbox

Message ID bug-106258-502-klNFUqrKVL@http.bugs.freedesktop.org/
State New
Headers show

Commit Message

bugzilla-daemon@freedesktop.org June 21, 2018, 10:22 a.m. UTC
https://bugs.freedesktop.org/show_bug.cgi?id=106258

--- Comment #36 from foxbat@ruin.net ---
(In reply to Michel Dänzer from comment #35)
> Created attachment 140257 [details] [review]
> drm/amdgpu: GPU vs CPU page size fixes in  amdgpu_vm_bo_split_mapping
> 
> Does this patch help?

It looks like the patch isn't fully applying (using tree 4.17):

patching file drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
Hunk #1 FAILED at 1577.
Hunk #2 succeeded at 1463 with fuzz 2 (offset -127 lines).
Hunk #3 succeeded at 1480 (offset -125 lines).
1 out of 3 hunks FAILED -- saving rejects to file
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c.rej

rejects:


                                if (pages_addr[idx] !=

Patch
diff mbox

--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ 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;