Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: drop the ib from the VM update parameters

It is redundant with the job pointer.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Christian König and committed by
Alex Deucher
110aef57 ecf96b52

+13 -16
-5
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
··· 204 204 struct amdgpu_job *job; 205 205 206 206 /** 207 - * @ib: indirect buffer to fill with commands 208 - */ 209 - struct amdgpu_ib *ib; 210 - 211 - /** 212 207 * @num_dw_left: number of dw left for the IB 213 208 */ 214 209 unsigned int num_dw_left;
+13 -11
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
··· 78 78 return r; 79 79 80 80 p->num_dw_left = ndw; 81 - p->ib = &p->job->ibs[0]; 82 81 return 0; 83 82 } 84 83 ··· 94 95 struct dma_fence **fence) 95 96 { 96 97 struct amdgpu_bo *root = p->vm->root.base.bo; 98 + struct amdgpu_ib *ib = p->job->ibs; 97 99 struct amdgpu_ring *ring; 98 100 struct dma_fence *f; 99 101 int r; 100 102 101 103 ring = container_of(p->vm->entity.rq->sched, struct amdgpu_ring, sched); 102 104 103 - WARN_ON(p->ib->length_dw == 0); 104 - amdgpu_ring_pad_ib(ring, p->ib); 105 - WARN_ON(p->ib->length_dw > p->num_dw_left); 105 + WARN_ON(ib->length_dw == 0); 106 + amdgpu_ring_pad_ib(ring, ib); 107 + WARN_ON(ib->length_dw > p->num_dw_left); 106 108 r = amdgpu_job_submit(p->job, &p->vm->entity, 107 109 AMDGPU_FENCE_OWNER_VM, &f); 108 110 if (r) ··· 135 135 struct amdgpu_bo *bo, uint64_t pe, 136 136 unsigned count) 137 137 { 138 - uint64_t src = p->ib->gpu_addr; 138 + struct amdgpu_ib *ib = p->job->ibs; 139 + uint64_t src = ib->gpu_addr; 139 140 140 141 src += p->num_dw_left * 4; 141 142 142 143 pe += amdgpu_bo_gpu_offset(bo); 143 144 trace_amdgpu_vm_copy_ptes(pe, src, count); 144 145 145 - amdgpu_vm_copy_pte(p->adev, p->ib, pe, src, count); 146 + amdgpu_vm_copy_pte(p->adev, ib, pe, src, count); 146 147 } 147 148 148 149 /** ··· 165 164 uint64_t addr, unsigned count, 166 165 uint32_t incr, uint64_t flags) 167 166 { 167 + struct amdgpu_ib *ib = p->job->ibs; 168 + 168 169 pe += amdgpu_bo_gpu_offset(bo); 169 170 trace_amdgpu_vm_set_ptes(pe, addr, count, incr, flags); 170 171 if (count < 3) { 171 - amdgpu_vm_write_pte(p->adev, p->ib, pe, addr | flags, 172 + amdgpu_vm_write_pte(p->adev, ib, pe, addr | flags, 172 173 count, incr); 173 174 } else { 174 - amdgpu_vm_set_pte_pde(p->adev, p->ib, pe, addr, 175 + amdgpu_vm_set_pte_pde(p->adev, ib, pe, addr, 175 176 count, incr, flags); 176 177 } 177 178 } ··· 203 200 204 201 do { 205 202 ndw = p->num_dw_left; 206 - ndw -= p->ib->length_dw; 203 + ndw -= p->job->ibs->length_dw; 207 204 208 205 if (ndw < 32) { 209 206 r = amdgpu_vm_sdma_commit(p, NULL); ··· 222 219 return r; 223 220 224 221 p->num_dw_left = ndw; 225 - p->ib = &p->job->ibs[0]; 226 222 } 227 223 228 224 if (!p->pages_addr) { ··· 245 243 246 244 /* Put the PTEs at the end of the IB. */ 247 245 p->num_dw_left -= nptes * 2; 248 - pte = (uint64_t *)&(p->ib->ptr[p->num_dw_left]); 246 + pte = (uint64_t *)&(p->job->ibs->ptr[p->num_dw_left]); 249 247 for (i = 0; i < nptes; ++i, addr += incr) { 250 248 pte[i] = amdgpu_vm_map_gart(p->pages_addr, addr); 251 249 pte[i] |= flags;