diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2018-03-27 17:51:41 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2018-05-15 14:43:14 -0400 |
| commit | 4dfe7d7b4e3ba16fc377a48a221bfe8172bc50e1 (patch) | |
| tree | 61a8baa6c770d01c7892f485aa1c49f47e150e61 /drivers/gpu/drm | |
| parent | 10ed3c3190d38f189ed6857cecca1a2eb6de33a3 (diff) | |
drm/amdgpu/sdma4: add emit_reg_write_reg_wait ring callback (v2)
This adds support for writing and reading back in a single
oneshot packet. This is needed to send a tlb invalidation
and wait for ack in a single operation.
v2: squash sdma hang fix into this patch
Reviewed-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Emily Deng <Emily.Deng@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c index 2c618a1be03e..03a36cbe7557 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | |||
| @@ -1611,6 +1611,7 @@ static const struct amdgpu_ring_funcs sdma_v4_0_ring_funcs = { | |||
| 1611 | .pad_ib = sdma_v4_0_ring_pad_ib, | 1611 | .pad_ib = sdma_v4_0_ring_pad_ib, |
| 1612 | .emit_wreg = sdma_v4_0_ring_emit_wreg, | 1612 | .emit_wreg = sdma_v4_0_ring_emit_wreg, |
| 1613 | .emit_reg_wait = sdma_v4_0_ring_emit_reg_wait, | 1613 | .emit_reg_wait = sdma_v4_0_ring_emit_reg_wait, |
| 1614 | .emit_reg_write_reg_wait = amdgpu_ring_emit_reg_write_reg_wait_helper, | ||
| 1614 | }; | 1615 | }; |
| 1615 | 1616 | ||
| 1616 | static void sdma_v4_0_set_ring_funcs(struct amdgpu_device *adev) | 1617 | static void sdma_v4_0_set_ring_funcs(struct amdgpu_device *adev) |