diff options
author | Christian König <christian.koenig@amd.com> | 2016-05-06 11:50:03 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-05-11 13:30:31 -0400 |
commit | d88bf583bd06eecb31f82871c90ef6a5a09b5766 (patch) | |
tree | 122631666a828a4705350d6f2e68be19c312bc74 /drivers/gpu/drm/amd/amdgpu/cik_sdma.c | |
parent | 92f250989b7098f4b52d50183a7b2fc4e010731b (diff) |
drm/amdgpu: move VM fields into job
They are the same for all IBs.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/cik_sdma.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c index 6c2aa2b863b2..518dca43b133 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c | |||
@@ -210,9 +210,10 @@ static void cik_sdma_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count) | |||
210 | * Schedule an IB in the DMA ring (CIK). | 210 | * Schedule an IB in the DMA ring (CIK). |
211 | */ | 211 | */ |
212 | static void cik_sdma_ring_emit_ib(struct amdgpu_ring *ring, | 212 | static void cik_sdma_ring_emit_ib(struct amdgpu_ring *ring, |
213 | struct amdgpu_ib *ib, bool ctx_switch) | 213 | struct amdgpu_ib *ib, |
214 | unsigned vm_id, bool ctx_switch) | ||
214 | { | 215 | { |
215 | u32 extra_bits = ib->vm_id & 0xf; | 216 | u32 extra_bits = vm_id & 0xf; |
216 | u32 next_rptr = ring->wptr + 5; | 217 | u32 next_rptr = ring->wptr + 5; |
217 | 218 | ||
218 | while ((next_rptr & 7) != 4) | 219 | while ((next_rptr & 7) != 4) |