Unified · Split
| @@ -984,7 +984,7 @@ static void amdgpu_vm_cpu_set_ptes(struct amdgpu_pte_update_params *params, · 983 unmodified lines | |||
| 984 | value = params->pages_addr ? | 984 | value = params->pages_addr ? |
| 985 | amdgpu_vm_map_gart(params->pages_addr, addr) : | 985 | amdgpu_vm_map_gart(params->pages_addr, addr) : |
| 986 | addr; | 986 | addr; |
| 987 | amdgpu_gart_set_pte_pde(params->adev, (void *)pe, | 987 | amdgpu_gart_set_pte_pde(params->adev, (void *)(uintptr_t)pe, |
| 988 | i, value, flags); | 988 | i, value, flags); |
| 989 | addr += incr; | 989 | addr += incr; |
| 990 | } | 990 | } |
| @@ -1023,11 +1023,11 @@ static int amdgpu_vm_update_level(struct amdgpu_device *adev, · 32 unmodified lines | |||
| 1023 | unsigned level) | 1023 | unsigned level) |
| 1024 | { | 1024 | { |
| 1025 | struct amdgpu_bo *shadow; | 1025 | struct amdgpu_bo *shadow; |
| 1026 | struct amdgpu_ring *ring; | 1026 | struct amdgpu_ring *ring = NULL; |
| 1027 | uint64_t pd_addr, shadow_addr; | 1027 | uint64_t pd_addr, shadow_addr = 0; |
| 1028 | uint32_t incr = amdgpu_vm_bo_size(adev, level + 1); | 1028 | uint32_t incr = amdgpu_vm_bo_size(adev, level + 1); |
| 1029 | uint64_t last_pde = ~0, last_pt = ~0, last_shadow = ~0; | 1029 | uint64_t last_pde = ~0, last_pt = ~0, last_shadow = ~0; |
| 1030 | unsigned count = 0, pt_idx, ndw; | 1030 | unsigned count = 0, pt_idx, ndw = 0; |
| 1031 | struct amdgpu_job *job; | 1031 | struct amdgpu_job *job; |
| 1032 | struct amdgpu_pte_update_params params; | 1032 | struct amdgpu_pte_update_params params; |
| 1033 | struct dma_fence *fence = NULL; | 1033 | struct dma_fence *fence = NULL; |