Merge branch 'drm-fixes-5.0' of git://people.freedesktop.org/~agd5f/linux into drm...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_vm.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index a0a11d399795d29ed03d2dd0a34015eac290da24..d2ea5ce2cefbee26506e4eeeeb3ed2ac24663cab 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -181,7 +181,7 @@ static unsigned amdgpu_vm_num_entries(struct amdgpu_device *adev,
 
        if (level == adev->vm_manager.root_level)
                /* For the root directory */
 
        if (level == adev->vm_manager.root_level)
                /* For the root directory */

-               return round_up(adev->vm_manager.max_pfn, 1 << shift) >> shift;
+               return round_up(adev->vm_manager.max_pfn, 1ULL << shift) >> shift;

        else if (level != AMDGPU_VM_PTB)
                /* Everything in between */
                return 512;
        else if (level != AMDGPU_VM_PTB)
                /* Everything in between */
                return 512;


@@ -1650,9 +1650,11 @@ static int amdgpu_vm_update_ptes(struct amdgpu_pte_update_params *params,
                        if (!amdgpu_vm_pt_descendant(adev, &cursor))
                                return -ENOENT;
                        continue;
                        if (!amdgpu_vm_pt_descendant(adev, &cursor))
                                return -ENOENT;
                        continue;

-               } else if (frag >= parent_shift) {
+               } else if (frag >= parent_shift &&
+                          cursor.level - 1 != adev->vm_manager.root_level) {

                        /* If the fragment size is even larger than the parent
                        /* If the fragment size is even larger than the parent

-                        * shift we should go up one level and check it again.
+                        * shift we should go up one level and check it again
+                        * unless one level up is the root level.

                         */
                        if (!amdgpu_vm_pt_ancestor(&cursor))
                                return -ENOENT;
                         */
                        if (!amdgpu_vm_pt_ancestor(&cursor))
                                return -ENOENT;


@@ -1660,10 +1662,10 @@ static int amdgpu_vm_update_ptes(struct amdgpu_pte_update_params *params,
                }
 
                /* Looks good so far, calculate parameters for the update */
                }
 
                /* Looks good so far, calculate parameters for the update */

-               incr = AMDGPU_GPU_PAGE_SIZE << shift;
+               incr = (uint64_t)AMDGPU_GPU_PAGE_SIZE << shift;

                mask = amdgpu_vm_entries_mask(adev, cursor.level);
                pe_start = ((cursor.pfn >> shift) & mask) * 8;
                mask = amdgpu_vm_entries_mask(adev, cursor.level);
                pe_start = ((cursor.pfn >> shift) & mask) * 8;

-               entry_end = (mask + 1) << shift;
+               entry_end = (uint64_t)(mask + 1) << shift;

                entry_end += cursor.pfn & ~(entry_end - 1);
                entry_end = min(entry_end, end);
 
                entry_end += cursor.pfn & ~(entry_end - 1);
                entry_end = min(entry_end, end);
 


@@ -1676,7 +1678,7 @@ static int amdgpu_vm_update_ptes(struct amdgpu_pte_update_params *params,
                                              flags | AMDGPU_PTE_FRAG(frag));
 
                        pe_start += nptes * 8;
                                              flags | AMDGPU_PTE_FRAG(frag));
 
                        pe_start += nptes * 8;

-                       dst += nptes * AMDGPU_GPU_PAGE_SIZE << shift;
+                       dst += (uint64_t)nptes * AMDGPU_GPU_PAGE_SIZE << shift;

 
                        frag_start = upd_end;
                        if (frag_start >= frag_end) {
 
                        frag_start = upd_end;
                        if (frag_start >= frag_end) {