Change-Id: Ib72058337f0aa53adfc6c6aae5341a7cd665111a Signed-off-by: Oak Zeng <ozeng@xxxxxxx> Suggested-by: Felix Kuehling <Felix.Kuehling@xxxxxxx> Suggested-by: Alex Deucher <alexander.deucher@xxxxxxx> --- drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + .../drm/amd/amdgpu/vega10_doorbell_index_init.c | 54 ++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/vega10_doorbell_index_init.c diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile index f76bcb9..61cea57 100644 --- a/drivers/gpu/drm/amd/amdgpu/Makefile +++ b/drivers/gpu/drm/amd/amdgpu/Makefile @@ -63,7 +63,7 @@ amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o dce amdgpu-y += \ vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o nbio_v7_0.o vega10_reg_init.o \ - vega20_reg_init.o nbio_v7_4.o + vega20_reg_init.o nbio_v7_4.o vega10_doorbell_index_init.o # add DF block amdgpu-y += \ 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_doorbell_index_init.c b/drivers/gpu/drm/amd/amdgpu/vega10_doorbell_index_init.c new file mode 100644 index 0000000..e8216a3 --- /dev/null +++ b/drivers/gpu/drm/amd/amdgpu/vega10_doorbell_index_init.c @@ -0,0 +1,54 @@ +/* + * Copyright 2018 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + */ + +#include "amdgpu.h" + +void vega10_doorbell_index_init(struct amdgpu_device *adev) +{ + adev->doorbell_index.kiq = 0x00; + adev->doorbell_index.mec_ring0 = 0x03; + adev->doorbell_index.mec_ring1 = 0x04; + adev->doorbell_index.mec_ring2 = 0x05; + adev->doorbell_index.mec_ring3 = 0x06; + adev->doorbell_index.mec_ring4 = 0x07; + adev->doorbell_index.mec_ring5 = 0x08; + adev->doorbell_index.mec_ring6 = 0x09; + adev->doorbell_index.mec_ring7 = 0x0a; + adev->doorbell_index.userqueue_start = 0x0b; + adev->doorbell_index.userqueue_end = 0x8a; + adev->doorbell_index.gfx_ring0 = 0x8b; + adev->doorbell_index.sdma_engine0 = 0xf0; + adev->doorbell_index.sdma_engine1 = 0xf2; + adev->doorbell_index.ih = 0xf4; + adev->doorbell_index.uvd_vce.uvd_ring0_1 = 0xf8; + adev->doorbell_index.uvd_vce.uvd_ring2_3 = 0xf9; + adev->doorbell_index.uvd_vce.uvd_ring4_5 = 0xfa; + adev->doorbell_index.uvd_vce.uvd_ring6_7 = 0xfb; + adev->doorbell_index.uvd_vce.vce_ring0_1 = 0xfc; + adev->doorbell_index.uvd_vce.vce_ring2_3 = 0xfd; + adev->doorbell_index.uvd_vce.vce_ring4_5 = 0xfe; + adev->doorbell_index.uvd_vce.vce_ring6_7 = 0xff; + /* In unit of dword doorbell */ + adev->doorbell_index.max_assignment = 0xff << 1; +} + -- 2.7.4 _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx