diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
| commit | 4eebf60b7452fbd551fd7dece855ba7825a49cbc (patch) | |
| tree | 490b4d194ba09c90e10201ab7fc084a0bda0ed27 /drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | |
| parent | 8f9cb50789e76f3e224e8861adf650e55c747af4 (diff) | |
| parent | 2c6625cd545bdd66acff14f3394865d43920a5c7 (diff) | |
Merge tag 'v4.2-rc7' into drm-next
Linux 4.2-rc7
Backmerge master for i915 fixes
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c index 52dff75aac6f..bc0fac618a3f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | |||
| @@ -180,16 +180,16 @@ int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs, | |||
| 180 | if (vm) { | 180 | if (vm) { |
| 181 | /* do context switch */ | 181 | /* do context switch */ |
| 182 | amdgpu_vm_flush(ring, vm, ib->sync.last_vm_update); | 182 | amdgpu_vm_flush(ring, vm, ib->sync.last_vm_update); |
| 183 | } | ||
| 184 | 183 | ||
| 185 | if (vm && ring->funcs->emit_gds_switch) | 184 | if (ring->funcs->emit_gds_switch) |
| 186 | amdgpu_ring_emit_gds_switch(ring, ib->vm->ids[ring->idx].id, | 185 | amdgpu_ring_emit_gds_switch(ring, ib->vm->ids[ring->idx].id, |
| 187 | ib->gds_base, ib->gds_size, | 186 | ib->gds_base, ib->gds_size, |
| 188 | ib->gws_base, ib->gws_size, | 187 | ib->gws_base, ib->gws_size, |
| 189 | ib->oa_base, ib->oa_size); | 188 | ib->oa_base, ib->oa_size); |
| 190 | 189 | ||
| 191 | if (ring->funcs->emit_hdp_flush) | 190 | if (ring->funcs->emit_hdp_flush) |
| 192 | amdgpu_ring_emit_hdp_flush(ring); | 191 | amdgpu_ring_emit_hdp_flush(ring); |
| 192 | } | ||
| 193 | 193 | ||
| 194 | old_ctx = ring->current_ctx; | 194 | old_ctx = ring->current_ctx; |
| 195 | for (i = 0; i < num_ibs; ++i) { | 195 | for (i = 0; i < num_ibs; ++i) { |