On Wed, Nov 21, 2018 at 5:00 PM Oak Zeng <oz...@amd.com> wrote:
>
> v2: Use enum definition instead of hardcoded value
>
> Change-Id: Ib72058337f0aa53adfc6c6aae5341a7cd665111a
> Signed-off-by: Oak Zeng <oz...@amd.com>
> Suggested-by: Felix Kuehling <felix.kuehl...@amd.com>
> Suggested-by: Alex Deucher <alexander.deuc...@amd.com>
Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/soc15.h | 1 +
> drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 28
> ++++++++++++++++++++++++++++
> 2 files changed, 29 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.h
> b/drivers/gpu/drm/amd/amdgpu/soc15.h
> index f8ad780..d37c57d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.h
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.h
> @@ -58,4 +58,5 @@ void soc15_program_register_sequence(struct amdgpu_device
> *adev,
> int vega10_reg_base_init(struct amdgpu_device *adev);
> int vega20_reg_base_init(struct amdgpu_device *adev);
>
> +void vega10_doorbell_index_init(struct amdgpu_device *adev);
> #endif
> diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
> b/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
> index c5c9b2b..9ba8e02 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
> @@ -56,4 +56,32 @@ int vega10_reg_base_init(struct amdgpu_device *adev)
> return 0;
> }
>
> +void vega10_doorbell_index_init(struct amdgpu_device *adev)
> +{
> + adev->doorbell_index.kiq = AMDGPU_DOORBELL64_KIQ;
> + adev->doorbell_index.mec_ring0 = AMDGPU_DOORBELL64_MEC_RING0;
> + adev->doorbell_index.mec_ring1 = AMDGPU_DOORBELL64_MEC_RING1;
> + adev->doorbell_index.mec_ring2 = AMDGPU_DOORBELL64_MEC_RING2;
> + adev->doorbell_index.mec_ring3 = AMDGPU_DOORBELL64_MEC_RING3;
> + adev->doorbell_index.mec_ring4 = AMDGPU_DOORBELL64_MEC_RING4;
> + adev->doorbell_index.mec_ring5 = AMDGPU_DOORBELL64_MEC_RING5;
> + adev->doorbell_index.mec_ring6 = AMDGPU_DOORBELL64_MEC_RING6;
> + adev->doorbell_index.mec_ring7 = AMDGPU_DOORBELL64_MEC_RING7;
> + adev->doorbell_index.userqueue_start =
> AMDGPU_DOORBELL64_USERQUEUE_START;
> + adev->doorbell_index.userqueue_end = AMDGPU_DOORBELL64_USERQUEUE_END;
> + adev->doorbell_index.gfx_ring0 = AMDGPU_DOORBELL64_GFX_RING0;
> + adev->doorbell_index.sdma_engine0 =
> AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0;
> + adev->doorbell_index.sdma_engine1 =
> AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE1;
> + adev->doorbell_index.ih = AMDGPU_DOORBELL64_IH;
> + adev->doorbell_index.uvd_vce.uvd_ring0_1 =
> AMDGPU_DOORBELL64_UVD_RING0_1;
> + adev->doorbell_index.uvd_vce.uvd_ring2_3 =
> AMDGPU_DOORBELL64_UVD_RING2_3;
> + adev->doorbell_index.uvd_vce.uvd_ring4_5 =
> AMDGPU_DOORBELL64_UVD_RING4_5;
> + adev->doorbell_index.uvd_vce.uvd_ring6_7 =
> AMDGPU_DOORBELL64_UVD_RING6_7;
> + adev->doorbell_index.uvd_vce.vce_ring0_1 =
> AMDGPU_DOORBELL64_VCE_RING0_1;
> + adev->doorbell_index.uvd_vce.vce_ring2_3 =
> AMDGPU_DOORBELL64_VCE_RING2_3;
> + adev->doorbell_index.uvd_vce.vce_ring4_5 =
> AMDGPU_DOORBELL64_VCE_RING4_5;
> + adev->doorbell_index.uvd_vce.vce_ring6_7 =
> AMDGPU_DOORBELL64_VCE_RING6_7;
> + /* In unit of dword doorbell */
> + adev->doorbell_index.max_assignment =
> AMDGPU_DOORBELL64_MAX_ASSIGNMENT << 1;
> +}
>
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
