Am 28.03.2018 um 00:32 schrieb Alex Deucher:
> This callback writes a value to a register and then reads
> back another register and waits for a value in a single
> operation.
>
> Provide a helper function using two operations for engines
> that don't support this opertion.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
Series is Reviewed-by: Christian König <christian.koenig at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 +
> drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 20 ++++++++++++++++++++
> drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 7 +++++++
> 3 files changed, 28 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index f44a83ab2bf4..7320b465f333 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -1787,6 +1787,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)
> #define amdgpu_ring_emit_rreg(r, d) (r)->funcs->emit_rreg((r), (d))
> #define amdgpu_ring_emit_wreg(r, d, v) (r)->funcs->emit_wreg((r), (d), (v))
> #define amdgpu_ring_emit_reg_wait(r, d, v, m) (r)->funcs->emit_reg_wait((r), (d), (v), (m))
> +#define amdgpu_ring_emit_reg_write_reg_wait(r, d0, d1, v, m) (r)->funcs->emit_reg_write_reg_wait((r), (d0), (d1), (v), (m))
> #define amdgpu_ring_emit_tmz(r, b) (r)->funcs->emit_tmz((r), (b))
> #define amdgpu_ring_pad_ib(r, ib) ((r)->funcs->pad_ib((r), (ib)))
> #define amdgpu_ring_init_cond_exec(r) (r)->funcs->init_cond_exec((r))
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> index d5f526f38e50..49cad08b5c16 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> @@ -459,6 +459,26 @@ void amdgpu_ring_lru_touch(struct amdgpu_device *adev, struct amdgpu_ring *ring)
> spin_unlock(&adev->ring_lru_list_lock);
> }
>
> +/**
> + * amdgpu_ring_emit_reg_write_reg_wait_helper - ring helper
> + *
> + * @adev: amdgpu_device pointer
> + * @reg0: register to write
> + * @reg1: register to wait on
> + * @ref: reference value to write/wait on
> + * @mask: mask to wait on
> + *
> + * Helper for rings that don't support write and wait in a
> + * single oneshot packet.
> + */
> +void amdgpu_ring_emit_reg_write_reg_wait_helper(struct amdgpu_ring *ring,
> + uint32_t reg0, uint32_t reg1,
> + uint32_t ref, uint32_t mask)
> +{
> + amdgpu_ring_emit_wreg(ring, reg0, ref);
> + amdgpu_ring_emit_reg_wait(ring, reg1, mask, mask);
> +}
> +
> /*
> * Debugfs info
> */
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
> index 1a5911882657..08fcdf6f7b53 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
> @@ -154,6 +154,9 @@ struct amdgpu_ring_funcs {
> void (*emit_wreg)(struct amdgpu_ring *ring, uint32_t reg, uint32_t val);
> void (*emit_reg_wait)(struct amdgpu_ring *ring, uint32_t reg,
> uint32_t val, uint32_t mask);
> + void (*emit_reg_write_reg_wait)(struct amdgpu_ring *ring,
> + uint32_t reg0, uint32_t reg1,
> + uint32_t ref, uint32_t mask);
> void (*emit_tmz)(struct amdgpu_ring *ring, bool start);
> /* priority functions */
> void (*set_priority) (struct amdgpu_ring *ring,
> @@ -228,6 +231,10 @@ int amdgpu_ring_lru_get(struct amdgpu_device *adev, int type,
> int *blacklist, int num_blacklist,
> bool lru_pipe_order, struct amdgpu_ring **ring);
> void amdgpu_ring_lru_touch(struct amdgpu_device *adev, struct amdgpu_ring *ring);
> +void amdgpu_ring_emit_reg_write_reg_wait_helper(struct amdgpu_ring *ring,
> + uint32_t reg0, uint32_t val0,
> + uint32_t reg1, uint32_t val1);
> +
> static inline void amdgpu_ring_clear_ring(struct amdgpu_ring *ring)
> {
> int i = 0;
