Am 19.08.2017 um 05:57 schrieb Alex Deucher:
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
Acked-by: Christian König <christian.koenig at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 12 ++++++------
> drivers/gpu/drm/amd/include/vi_structs.h | 4 ++--
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> index 0710b0b..10fa2c4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> @@ -4578,9 +4578,9 @@ static int gfx_v8_0_mqd_init(struct amdgpu_ring *ring)
> mqd->compute_misc_reserved = 0x00000003;
> if (!(adev->flags & AMD_IS_APU)) {
> mqd->dynamic_cu_mask_addr_lo = lower_32_bits(ring->mqd_gpu_addr
> - + offsetof(struct vi_mqd_allocation, dyamic_cu_mask));
> + + offsetof(struct vi_mqd_allocation, dynamic_cu_mask));
> mqd->dynamic_cu_mask_addr_hi = upper_32_bits(ring->mqd_gpu_addr
> - + offsetof(struct vi_mqd_allocation, dyamic_cu_mask));
> + + offsetof(struct vi_mqd_allocation, dynamic_cu_mask));
> }
> eop_base_addr = ring->eop_gpu_addr >> 8;
> mqd->cp_hqd_eop_base_addr_lo = eop_base_addr;
> @@ -4767,8 +4767,8 @@ static int gfx_v8_0_kiq_init_queue(struct amdgpu_ring *ring)
> mutex_unlock(&adev->srbm_mutex);
> } else {
> memset((void *)mqd, 0, sizeof(struct vi_mqd_allocation));
> - ((struct vi_mqd_allocation *)mqd)->dyamic_cu_mask = 0xFFFFFFFF;
> - ((struct vi_mqd_allocation *)mqd)->dyamic_rb_mask = 0xFFFFFFFF;
> + ((struct vi_mqd_allocation *)mqd)->dynamic_cu_mask = 0xFFFFFFFF;
> + ((struct vi_mqd_allocation *)mqd)->dynamic_rb_mask = 0xFFFFFFFF;
> mutex_lock(&adev->srbm_mutex);
> vi_srbm_select(adev, ring->me, ring->pipe, ring->queue, 0);
> gfx_v8_0_mqd_init(ring);
> @@ -4791,8 +4791,8 @@ static int gfx_v8_0_kcq_init_queue(struct amdgpu_ring *ring)
>
> if (!adev->gfx.in_reset && !adev->gfx.in_suspend) {
> memset((void *)mqd, 0, sizeof(struct vi_mqd_allocation));
> - ((struct vi_mqd_allocation *)mqd)->dyamic_cu_mask = 0xFFFFFFFF;
> - ((struct vi_mqd_allocation *)mqd)->dyamic_rb_mask = 0xFFFFFFFF;
> + ((struct vi_mqd_allocation *)mqd)->dynamic_cu_mask = 0xFFFFFFFF;
> + ((struct vi_mqd_allocation *)mqd)->dynamic_rb_mask = 0xFFFFFFFF;
> mutex_lock(&adev->srbm_mutex);
> vi_srbm_select(adev, ring->me, ring->pipe, ring->queue, 0);
> gfx_v8_0_mqd_init(ring);
> diff --git a/drivers/gpu/drm/amd/include/vi_structs.h b/drivers/gpu/drm/amd/include/vi_structs.h
> index ca93b51..3e606a7 100644
> --- a/drivers/gpu/drm/amd/include/vi_structs.h
> +++ b/drivers/gpu/drm/amd/include/vi_structs.h
> @@ -419,8 +419,8 @@ struct vi_mqd_allocation {
> struct vi_mqd mqd;
> uint32_t wptr_poll_mem;
> uint32_t rptr_report_mem;
> - uint32_t dyamic_cu_mask;
> - uint32_t dyamic_rb_mask;
> + uint32_t dynamic_cu_mask;
> + uint32_t dynamic_rb_mask;
> };
>
> struct cz_mqd {
