drm/amdgpu: Add field in amdgpu_dev to hold reserved doorbell index
Subsystems (3)
PATCH 1/7 drm/amdgpu: Add field in amdgpu_dev to hold reserved doorbell index
This is a preparation work to make reserved doorbell index per device, instead of using a global macro definition. By doing this, we can easily change doorbell layout for future ASICs while not affecting ASICs in production.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 50 +++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +50 -0
@@ -813,6 +813,55 @@ struct amd_powerplay {uint32_t pp_feature; }; +/* Reserved doorbells for amdgpu (including multimedia). +* KFD can use all the rest in the 2M doorbell bar. +* For asic before vega10, doorbell is 32-bit, so the +* index/offset is in dword. For vega10 and after, doorbell +* can be 64-bit, so the index defined is in qword. +*/ +struct amdgpu_doorbell_index { +uint32_t kiq; +uint32_t mec_ring0; +uint32_t mec_ring1; +uint32_t mec_ring2; +uint32_t mec_ring3; +uint32_t mec_ring4; +uint32_t mec_ring5; +uint32_t mec_ring6; +uint32_t mec_ring7; +uint32_t userqueue_start; +uint32_t userqueue_end; +uint32_t gfx_ring0; +uint32_t sdma_engine0; +uint32_t sdma_engine1; +uint32_t sdma_engine2; +uint32_t sdma_engine3; +uint32_t sdma_engine4; +uint32_t sdma_engine5; +uint32_t sdma_engine6; +uint32_t sdma_engine7; +uint32_t ih; +union { +struct { +uint32_t vcn_ring0_1; +uint32_t vcn_ring2_3; +uint32_t vcn_ring4_5; +uint32_t vcn_ring6_7; + } vcn; +struct { +uint32_t uvd_ring0_1; +uint32_t uvd_ring2_3; +uint32_t uvd_ring4_5; +uint32_t uvd_ring6_7; +uint32_t vce_ring0_1; +uint32_t vce_ring2_3; +uint32_t vce_ring4_5; +uint32_t vce_ring6_7; + } uvd_vce; + }; +uint32_t max_assignment; +}; +#define AMDGPU_RESET_MAGIC_NUM 64struct amdgpu_device {struct device *dev;
@@ -1026,6 +1075,7 @@ struct amdgpu_device {unsigned long last_mm_index;bool in_gpu_reset;struct mutex lock_reset; +struct amdgpu_doorbell_index doorbell_index; };static inline struct amdgpu_device *amdgpu_ttm_adev (struct ttm_bo_device *bdev)
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1542815518-8124-1-git-send-email-ozeng-5C7GfCeVMHo@public.gmane.org
PATCH 2/7 drm/amdgpu: Vega10 doorbell index initialization
--- 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
drivers/gpu/drm/amd/amdgpu/Makefile +1 -1
@@ -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 += \
drivers/gpu/drm/amd/amdgpu/soc15.h +1 -0
@@ -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
drivers/gpu/drm/amd/amdgpu/vega10_doorbell_index_init.c new file +54 -0
54 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1542815518-8124-2-git-send-email-ozeng-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 2/7] drm/amdgpu: Vega10 doorbell index initialization
Quoted 84 lines · Oak Zeng
Change-Id Ib72058337f0aa53adfc6c6aae5341a7cd665111aSigned-off-by Oak Zeng <[email protected]>Suggested-by Felix Kuehling <[email protected]>Suggested-by Alex Deucher <[email protected]>--- 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.cdrivers/gpu/drm/amd/amdgpu/Makefile +1
-1@@ -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 += \drivers/gpu/drm/amd/amdgpu/soc15.h +1
-0@@ -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 drivers/gpu/drm/amd/amdgpu/vega10_doorbell_index_init.c new file +43
-0@@ -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 ;
drivers/gpu/drm/amd/amdgpu/vega10_doorbell_index_init.c line 53
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vega10_doorbell_index_init.c new file +10
-0+ 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 ; +}
No need to add a new file for this. Just add this to vega10_reg_init.c. Also, please use the doorbell enums rather than hardcoding the numbers.
Alex
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/vega10_doorbell_index_init.c new file +1
-1+ --2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/7 drm/amdgpu: Vega12 doorbell index initialization
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + .../drm/amd/amdgpu/vega12_doorbell_index_init.c | 54 ++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/vega12_doorbell_index_init.c
drivers/gpu/drm/amd/amdgpu/Makefile +1 -1
@@ -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 vega10_doorbell_index_init.o + vega20_reg_init.o nbio_v7_4.o vega10_doorbell_index_init.o vega12_doorbell_index_init.o # add DF block amdgpu-y += \
drivers/gpu/drm/amd/amdgpu/soc15.h +1 -0
@@ -59,4 +59,5 @@ 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); +void vega12_doorbell_index_init (struct amdgpu_device *adev);#endif
drivers/gpu/drm/amd/amdgpu/vega12_doorbell_index_init.c new file +54 -0
54 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1542815518-8124-3-git-send-email-ozeng-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 3/7] drm/amdgpu: Vega12 doorbell index initialization
Quoted 84 lines · Oak Zeng
Change-Id Ib2c570224321bb7002d2ed01f43ac70203e86f88Signed-off-by Oak Zeng <[email protected]>Suggested-by Felix Kuehling <[email protected]>Suggested-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + .../drm/amd/amdgpu/vega12_doorbell_index_init.c | 54 ++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/vega12_doorbell_index_init.cdrivers/gpu/drm/amd/amdgpu/Makefile +1
-1@@ -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 vega10_doorbell_index_init.o + vega20_reg_init.o nbio_v7_4.o vega10_doorbell_index_init.o vega12_doorbell_index_init.o # add DF block amdgpu-y += \drivers/gpu/drm/amd/amdgpu/soc15.h +1
-0@@ -59,4 +59,5 @@ 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); +void vega12_doorbell_index_init (struct amdgpu_device *adev);#endif drivers/gpu/drm/amd/amdgpu/vega12_doorbell_index_init.c new file +43
-0@@ -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 vega12_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 =0xe0 ; + adev->doorbell_index.sdma_engine1 =0xe8 ; + adev->doorbell_index.ih =0xf4 ; + adev->doorbell_index.uvd_vce.uvd_ring0_1 =0xf8 ;
drivers/gpu/drm/amd/amdgpu/vega12_doorbell_index_init.c line 53
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vega12_doorbell_index_init.c new file +10
-0+ 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 ; +}
You can drop this patch. Just use the vega10 one for vega12. It's the same.
Alex
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/vega12_doorbell_index_init.c new file +1
-1+ --2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): CADnq5_PjTtoyYDROkVA8DVytBv2sdwS4_z840xzWCdL=RwXbrw@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): CADnq5_PjTtoyYDROkVA8DVytBv2sdwS4_z840xzWCdL=RwXbrw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
RE: [PATCH 3/7] drm/amdgpu: Vega12 doorbell index initialization
Hi Alex/Felix/Emily,
Sometime back this year Emily put a change for Vega10 to use different SDMA doorbells, to accommodate host driver settings for vega10 sriov . That change wasn't applied to vega12/raven. I received comment from Felix saying that we shouldn't change the doorbell layout for ASICs on the market. This is why I used different doorbells b/t vega10 and vega12. I think in this case, maybe vega12 also have the same sriov requirement. If you all agree, I will use vega10 doorbells for vega12 and raven. Please confirm.
/* sDMA engines reserved from 0xe0 -0xef */ AMDGPU_DOORBELL64_sDMA_ENGINE0 = 0xE0, AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0 = 0xE1, AMDGPU_DOORBELL64_sDMA_ENGINE1 = 0xE8, AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE1 = 0xE9, /* For vega10 sriov, the sdma doorbell must be fixed as follow * to keep the same setting with host driver, or it will * happen conflicts */ AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 = 0xF0, AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE0 = 0xF1, AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE1 = 0xF2, AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE1 = 0xF3,
thanks,
Oak
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Sunday, November 25, 2018 1:42 PM
To: Zeng, Oak <[email protected]>
Subject: Fwd: [PATCH 3/7] drm/amdgpu: Vega12 doorbell index initialization
---------- Forwarded message ---------
From: Alex Deucher <[email protected]>
Date: Wed, Nov 21, 2018 at 11:16 AM
Subject: Re: [PATCH 3/7] drm/amdgpu: Vega12 doorbell index initialization
To: <[email protected]>
Cc: amd-gfx list <[email protected]>, Oak Zeng <[email protected]>
Quoted 99 lines · Oak Zeng
Change-Id Ib2c570224321bb7002d2ed01f43ac70203e86f88Signed-off-by Oak Zeng <[email protected]>Suggested-by Felix Kuehling <[email protected]>Suggested-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + .../drm/amd/amdgpu/vega12_doorbell_index_init.c | 54 ++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644
drivers/gpu/drm/amd/amdgpu/vega12_doorbell_index_init.cdrivers/gpu/drm/amd/amdgpu/Makefile +0
-0@@ -63,7 +63,7 @@ amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.ogfx_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 \drivers/gpu/drm/amd/amdgpu/Makefile +2
-1- vega20_reg_init.o nbio_v7_4.o vega10_doorbell_index_init.o + vega20_reg_init.o nbio_v7_4.o vega10_doorbell_index_init.o + vega12_doorbell_index_init.o # add DF block amdgpu-y += \drivers/gpu/drm/amd/amdgpu/soc15.h +1
-0@@ -59,4 +59,5 @@ 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); +void vega12_doorbell_index_init (struct amdgpu_device *adev);#endif drivers/gpu/drm/amd/amdgpu/vega12_doorbell_index_init.c new file +53
-0@@ -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 vega12_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 =0xe0 ; + adev->doorbell_index.sdma_engine1 =0xe8 ; + adev->doorbell_index.ih =0xf4 ;
drivers/gpu/drm/amd/amdgpu/vega12_doorbell_index_init.c
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vega12_doorbell_index_init.c new file +10
-0+ 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 ; }
You can drop this patch. Just use the vega10 one for vega12. It's the same.
Alex
Quoted 8 lines
+
--
2.7.4_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/7 drm/amdgpu: Doorbell index initialization for ASICs before vega10
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- drivers/gpu/drm/amd/amdgpu/vi.h | 2 +- .../gpu/drm/amd/amdgpu/vi_doorbell_index_init.c | 43 ++++++++++++++++++++++ 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/vi_doorbell_index_init.c
drivers/gpu/drm/amd/amdgpu/Makefile +2 -1
@@ -63,7 +63,8 @@ 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 vega10_doorbell_index_init.o vega12_doorbell_index_init.o + vega20_reg_init.o nbio_v7_4.o vega10_doorbell_index_init.o vega12_doorbell_index_init.o \ + vi_doorbell_index_init.o # add DF block amdgpu-y += \
drivers/gpu/drm/amd/amdgpu/vi.h +1 -1
@@ -29,5 +29,5 @@void vi_srbm_select (struct amdgpu_device *adev,u32 me,u32 pipe,u32 queue,u32 vmid);int vi_set_ip_blocks (struct amdgpu_device *adev); - +void vi_doorbell_index_init (struct amdgpu_device *adev);#endif
drivers/gpu/drm/amd/amdgpu/vi_doorbell_index_init.c new file +43 -0
43 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1542815518-8124-4-git-send-email-ozeng-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 4/7] drm/amdgpu: Doorbell index initialization for ASICs before vega10
Quoted 75 lines · Oak Zeng
Change-Id Id64eb98f5b1c24b51eb2fd5a083086fc3515813dSigned-off-by Oak Zeng <[email protected]>Suggested-by Felix Kuehling <[email protected]>Suggested-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- drivers/gpu/drm/amd/amdgpu/vi.h | 2 +- .../gpu/drm/amd/amdgpu/vi_doorbell_index_init.c | 43 ++++++++++++++++++++++ 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/vi_doorbell_index_init.cdrivers/gpu/drm/amd/amdgpu/Makefile +2
-1@@ -63,7 +63,8 @@ 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 vega10_doorbell_index_init.o vega12_doorbell_index_init.o + vega20_reg_init.o nbio_v7_4.o vega10_doorbell_index_init.o vega12_doorbell_index_init.o \ + vi_doorbell_index_init.o # add DF block amdgpu-y += \drivers/gpu/drm/amd/amdgpu/vi.h +1
-1@@ -29,5 +29,5 @@void vi_srbm_select (struct amdgpu_device *adev,u32 me,u32 pipe,u32 queue,u32 vmid);int vi_set_ip_blocks (struct amdgpu_device *adev); - +void vi_doorbell_index_init (struct amdgpu_device *adev);#endif drivers/gpu/drm/amd/amdgpu/vi_doorbell_index_init.c new file +32
-0@@ -0,0 +1,43 @@ +/* +* 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 vi_doorbell_index_init (struct amdgpu_device *adev) +{ + adev->doorbell_index.kiq =0x00 ; + adev->doorbell_index.mec_ring0 =0x10 ; + adev->doorbell_index.mec_ring1 =0x11 ; + adev->doorbell_index.mec_ring2 =0x12 ; + adev->doorbell_index.mec_ring3 =0x13 ;
drivers/gpu/drm/amd/amdgpu/vi_doorbell_index_init.c line 42
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vi_doorbell_index_init.c new file +10
-0+ adev->doorbell_index.mec_ring4 =0x14 ; + adev->doorbell_index.mec_ring5 =0x15 ; + adev->doorbell_index.mec_ring6 =0x16 ; + adev->doorbell_index.mec_ring7 =0x17 ; + adev->doorbell_index.gfx_ring0 =0x20 ; + adev->doorbell_index.sdma_engine0 =0x1e0 ; + adev->doorbell_index.sdma_engine1 =0x1e1 ; + adev->doorbell_index.ih =0x1e8 ; + adev->doorbell_index.max_assignment =0x3ff ; +}
You can just add this to vi.c Please use the enums for the offsets.
Alex
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/vi_doorbell_index_init.c new file +1
-1+ --2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/7 drm/amdgpu: Call doorbell index init on device initialization
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7 -0
@@ -513,6 +513,13 @@ void amdgpu_device_pci_config_reset(struct amdgpu_device *adev)*/ static int amdgpu_device_doorbell_init (struct amdgpu_device *adev) { +if (adev->asic_type <CHIP_VEGA10 ) +vi_doorbell_index_init (adev); +else if (adev->asic_type ==CHIP_VEGA10 ) +vega10_doorbell_index_init (adev); +else +vega12_doorbell_index_init (adev); +/* No doorbell on SI hardware generation */ if (adev->asic_type <CHIP_BONAIRE ) { adev->doorbell.base =0 ;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1542815518-8124-5-git-send-email-ozeng-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
Quoted 5 lines · Oak Zeng
Change-Id I2f004bbbe2565035460686f4fc16e86b77a2a9b5Signed-off-by Oak Zeng <[email protected]>Suggested-by Felix Kuehling <[email protected]>Suggested-by Alex Deucher <[email protected]>
I think it would be cleaner to add this to the *_set_ip_blocks() functions in cik.c, vi.c, and soc15.c so it aligns with the *_reg_base_init() calls.
Alex
Quoted 25 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7
-1@@ -513,6 +513,13 @@ void amdgpu_device_pci_config_reset(struct amdgpu_device *adev)*/ static int amdgpu_device_doorbell_init (struct amdgpu_device *adev) { +if (adev->asic_type <CHIP_VEGA10 ) +vi_doorbell_index_init (adev); +else if (adev->asic_type ==CHIP_VEGA10 ) +vega10_doorbell_index_init (adev); +else +vega12_doorbell_index_init (adev); +/* No doorbell on SI hardware generation */ if (adev->asic_type <CHIP_BONAIRE ) { adev->doorbell.base =0 ; --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): CADnq5_O-ajV9xMFF5BsKUei48LLY1dGV3C_i+oDy+5J+Y2VwHA@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): CADnq5_O-ajV9xMFF5BsKUei48LLY1dGV3C_i+oDy+5J+Y2VwHA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
RE: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
Yes, that was my first version. But during debug, I found amdgpu_device_doorbell_init uses adev->doorbell_index.max_assignment which is initialized in *_doorbell_index_init. So I have to call *_doorbell_index_init before amdgpu_device_doorbell_init. *_set_ip_blocks() is too late.
In a later version, I moved calling of *_doorbell_index_init to the top of amdgpu_device_doorbell_init.
thanks,
Oak
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Sunday, November 25, 2018 1:43 PM
To: Zeng, Oak <[email protected]>
Subject: Fwd: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
---------- Forwarded message ---------
From: Alex Deucher <[email protected]>
Date: Wed, Nov 21, 2018 at 11:21 AM
Subject: Re: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
To: <[email protected]>
Cc: amd-gfx list <[email protected]>, Oak Zeng <[email protected]>
Quoted 5 lines · Oak Zeng
Change-Id I2f004bbbe2565035460686f4fc16e86b77a2a9b5Signed-off-by Oak Zeng <[email protected]>Suggested-by Felix Kuehling <[email protected]>Suggested-by Alex Deucher <[email protected]>
I think it would be cleaner to add this to the *_set_ip_blocks() functions in cik.c, vi.c, and soc15.c so it aligns with the *_reg_base_init() calls.
Alex
Quoted 25 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7
-1@@ -513,6 +513,13 @@ void amdgpu_device_pci_config_reset(struct amdgpu_device *adev)*/ static int amdgpu_device_doorbell_init (struct amdgpu_device *adev) { +if (adev->asic_type <CHIP_VEGA10 ) +vi_doorbell_index_init (adev); +else if (adev->asic_type ==CHIP_VEGA10 ) +vega10_doorbell_index_init (adev); +else +vega12_doorbell_index_init (adev); +/* No doorbell on SI hardware generation */ if (adev->asic_type <CHIP_BONAIRE ) { adev->doorbell.base =0 ; --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): BN6PR12MB165183EC3AAC7436C0E6846C80D70-/b2+HYfkarRSqX7PDniLCgdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Re: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
Ah, ok. no problem.
Alex
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Zeng, Oak <[email protected]>
Sent: Monday, November 26, 2018 10:31:04 AM
To: Alex Deucher
Cc: [email protected]
Subject: RE: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
Yes, that was my first version. But during debug, I found amdgpu_device_doorbell_init uses adev->doorbell_index.max_assignment which is initialized in *_doorbell_index_init. So I have to call *_doorbell_index_init before amdgpu_device_doorbell_init. *_set_ip_blocks() is too late.
In a later version, I moved calling of *_doorbell_index_init to the top of amdgpu_device_doorbell_init.
thanks,
Oak
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Sunday, November 25, 2018 1:43 PM
To: Zeng, Oak <[email protected]>
Subject: Fwd: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
---------- Forwarded message ---------
From: Alex Deucher <[email protected]>
Date: Wed, Nov 21, 2018 at 11:21 AM
Subject: Re: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
To: <[email protected]>
Cc: amd-gfx list <[email protected]>, Oak Zeng <[email protected]>
Quoted 5 lines · Oak Zeng
Change-Id I2f004bbbe2565035460686f4fc16e86b77a2a9b5Signed-off-by Oak Zeng <[email protected]>Suggested-by Felix Kuehling <[email protected]>Suggested-by Alex Deucher <[email protected]>
I think it would be cleaner to add this to the *_set_ip_blocks() functions in cik.c, vi.c, and soc15.c so it aligns with the *_reg_base_init() calls.
Alex
Quoted 25 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7
-1@@ -513,6 +513,13 @@ void amdgpu_device_pci_config_reset(struct amdgpu_device *adev)*/ static int amdgpu_device_doorbell_init (struct amdgpu_device *adev) { +if (adev->asic_type <CHIP_VEGA10 ) +vi_doorbell_index_init (adev); +else if (adev->asic_type ==CHIP_VEGA10 ) +vega10_doorbell_index_init (adev); +else +vega12_doorbell_index_init (adev); +/* No doorbell on SI hardware generation */ if (adev->asic_type <CHIP_BONAIRE ) { adev->doorbell.base =0 ; --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): BN6PR12MB1809D7A7892DC1A246F47750F7D70-/b2+HYfkarSEx6ez0IUAagdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Re: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
Maybe it would be better to add this as a callback to struct amdgpu_asic_funcs to avoid adding asic specific code to amdgpu_device.c
Alex
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Deucher, Alexander <[email protected]>
Sent: Monday, November 26, 2018 10:59:02 AM
To: Zeng, Oak; Alex Deucher
Cc: [email protected]
Subject: Re: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
Ah, ok. no problem.
Alex
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Zeng, Oak <[email protected]>
Sent: Monday, November 26, 2018 10:31:04 AM
To: Alex Deucher
Cc: [email protected]
Subject: RE: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
Yes, that was my first version. But during debug, I found amdgpu_device_doorbell_init uses adev->doorbell_index.max_assignment which is initialized in *_doorbell_index_init. So I have to call *_doorbell_index_init before amdgpu_device_doorbell_init. *_set_ip_blocks() is too late.
In a later version, I moved calling of *_doorbell_index_init to the top of amdgpu_device_doorbell_init.
thanks,
Oak
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Sunday, November 25, 2018 1:43 PM
To: Zeng, Oak <[email protected]>
Subject: Fwd: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
---------- Forwarded message ---------
From: Alex Deucher <[email protected]>
Date: Wed, Nov 21, 2018 at 11:21 AM
Subject: Re: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
To: <[email protected]>
Cc: amd-gfx list <[email protected]>, Oak Zeng <[email protected]>
Quoted 5 lines · Oak Zeng
Change-Id I2f004bbbe2565035460686f4fc16e86b77a2a9b5Signed-off-by Oak Zeng <[email protected]>Suggested-by Felix Kuehling <[email protected]>Suggested-by Alex Deucher <[email protected]>
I think it would be cleaner to add this to the *_set_ip_blocks() functions in cik.c, vi.c, and soc15.c so it aligns with the *_reg_base_init() calls.
Alex
Quoted 25 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7
-1@@ -513,6 +513,13 @@ void amdgpu_device_pci_config_reset(struct amdgpu_device *adev)*/ static int amdgpu_device_doorbell_init (struct amdgpu_device *adev) { +if (adev->asic_type <CHIP_VEGA10 ) +vi_doorbell_index_init (adev); +else if (adev->asic_type ==CHIP_VEGA10 ) +vega10_doorbell_index_init (adev); +else +vega12_doorbell_index_init (adev); +/* No doorbell on SI hardware generation */ if (adev->asic_type <CHIP_BONAIRE ) { adev->doorbell.base =0 ; --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): BN6PR12MB180989D8B99769C89F6F710FF7D70-/b2+HYfkarSEx6ez0IUAagdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
RE: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
That is good idea. Will do it.
thanks,
Oak
From: Deucher, Alexander
Sent: Monday, November 26, 2018 11:02 AM
To: Zeng, Oak <[email protected]>; Alex Deucher <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
Maybe it would be better to add this as a callback to struct amdgpu_asic_funcs to avoid adding asic specific code to amdgpu_device.c
Alex
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org<mailto:[email protected]>> on behalf of Deucher, Alexander <[email protected]<mailto:[email protected]>>
Sent: Monday, November 26, 2018 10:59:02 AM
To: Zeng, Oak; Alex Deucher
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
Ah, ok. no problem.
Alex
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org<mailto:[email protected]>> on behalf of Zeng, Oak <[email protected]<mailto:[email protected]>>
Sent: Monday, November 26, 2018 10:31:04 AM
To: Alex Deucher
Cc: [email protected]<mailto:[email protected]>
Subject: RE: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
Yes, that was my first version. But during debug, I found amdgpu_device_doorbell_init uses adev->doorbell_index.max_assignment which is initialized in *_doorbell_index_init. So I have to call *_doorbell_index_init before amdgpu_device_doorbell_init. *_set_ip_blocks() is too late.
In a later version, I moved calling of *_doorbell_index_init to the top of amdgpu_device_doorbell_init.
thanks,
Oak
-----Original Message-----
From: Alex Deucher <[email protected]<mailto:[email protected]>>
Sent: Sunday, November 25, 2018 1:43 PM
To: Zeng, Oak <[email protected]<mailto:[email protected]>>
Subject: Fwd: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
---------- Forwarded message ---------
From: Alex Deucher <[email protected]<mailto:[email protected]>>
Date: Wed, Nov 21, 2018 at 11:21 AM
Subject: Re: [PATCH 5/7] drm/amdgpu: Call doorbell index init on device initialization
To: <[email protected]<mailto:[email protected]>>
Cc: amd-gfx list <[email protected]<mailto:[email protected]>>, Oak Zeng <[email protected]<mailto:[email protected]>>
Quoted 5 lines · On Wed, Nov 21, 2018 at 10:52 AM Oak Zeng…
Change-Id I2f004bbbe2565035460686f4fc16e86b77a2a9b5Signed-off-by Oak Zeng <[email protected]<mailto:[email protected]>>
I think it would be cleaner to add this to the *_set_ip_blocks() functions in cik.c, vi.c, and soc15.c so it aligns with the *_reg_base_init() calls.
Alex
Quoted 25 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7
-1@@ -513,6 +513,13 @@ void amdgpu_device_pci_config_reset(struct amdgpu_device *adev)*/ static int amdgpu_device_doorbell_init (struct amdgpu_device *adev) { +if (adev->asic_type <CHIP_VEGA10 ) +vi_doorbell_index_init (adev); +else if (adev->asic_type ==CHIP_VEGA10 ) +vega10_doorbell_index_init (adev); +else +vega12_doorbell_index_init (adev); +/* No doorbell on SI hardware generation */ if (adev->asic_type <CHIP_BONAIRE ) { adev->doorbell.base =0 ; --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/7 drm/amdgpu: Use asic specific doorbell index instead of macro definition
In reply to a message not in the archiveAlso deleted doorbell index macro definition
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 106 ----------------------------- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 27 +++----- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 10 +-- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 8 +-- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 25 +++---- drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 2 +- 13 files changed, 36 insertions(+), 160 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -106
@@ -363,27 +363,6 @@ void amdgpu_fence_slab_fini(void);/* * GPU doorbell structures, functions & helpers */ -typedef enum _AMDGPU_DOORBELL_ASSIGNMENT -{ -AMDGPU_DOORBELL_KIQ =0x000 , -AMDGPU_DOORBELL_HIQ =0x001 , -AMDGPU_DOORBELL_DIQ =0x002 , -AMDGPU_DOORBELL_MEC_RING0 =0x010 , -AMDGPU_DOORBELL_MEC_RING1 =0x011 , -AMDGPU_DOORBELL_MEC_RING2 =0x012 , -AMDGPU_DOORBELL_MEC_RING3 =0x013 , -AMDGPU_DOORBELL_MEC_RING4 =0x014 , -AMDGPU_DOORBELL_MEC_RING5 =0x015 , -AMDGPU_DOORBELL_MEC_RING6 =0x016 , -AMDGPU_DOORBELL_MEC_RING7 =0x017 , -AMDGPU_DOORBELL_GFX_RING0 =0x020 , - AMDGPU_DOORBELL_sDMA_ENGINE0 =0x1E0 , - AMDGPU_DOORBELL_sDMA_ENGINE1 =0x1E1 , -AMDGPU_DOORBELL_IH =0x1E8 , -AMDGPU_DOORBELL_MAX_ASSIGNMENT =0x3FF , -AMDGPU_DOORBELL_INVALID =0xFFFF -}AMDGPU_DOORBELL_ASSIGNMENT ; -struct amdgpu_doorbell {/* doorbell mmio */ resource_size_t base;
@@ -393,91 +372,6 @@ struct amdgpu_doorbell { };/* -* 64bit doorbell, offset are in QWORD, occupy 2KB doorbell space -*/ -typedef enum _AMDGPU_DOORBELL64_ASSIGNMENT -{ -/* -* All compute related doorbells: kiq, hiq, diq, traditional compute queue, user queue, should locate in -* a continues range so that programming CP_MEC_DOORBELL_RANGE_LOWER/UPPER can cover this range. -* Compute related doorbells are allocated from 0x00 to 0x8a -*/ - - -/* kernel scheduling */ -AMDGPU_DOORBELL64_KIQ =0x00 , - -/* HSA interface queue and debug queue */ -AMDGPU_DOORBELL64_HIQ =0x01 , -AMDGPU_DOORBELL64_DIQ =0x02 , - -/* Compute engines */ -AMDGPU_DOORBELL64_MEC_RING0 =0x03 , -AMDGPU_DOORBELL64_MEC_RING1 =0x04 , -AMDGPU_DOORBELL64_MEC_RING2 =0x05 , -AMDGPU_DOORBELL64_MEC_RING3 =0x06 , -AMDGPU_DOORBELL64_MEC_RING4 =0x07 , -AMDGPU_DOORBELL64_MEC_RING5 =0x08 , -AMDGPU_DOORBELL64_MEC_RING6 =0x09 , -AMDGPU_DOORBELL64_MEC_RING7 =0x0a , - -/* User queue doorbell range (128 doorbells) */ -AMDGPU_DOORBELL64_USERQUEUE_START =0x0b , -AMDGPU_DOORBELL64_USERQUEUE_END =0x8a , - -/* Graphics engine */ -AMDGPU_DOORBELL64_GFX_RING0 =0x8b , - -/* -* Other graphics doorbells can be allocated here: from 0x8c to 0xdf -* Graphics voltage island aperture 1 -* default non-graphics QWORD index is 0xe0 - 0xFF inclusive -*/ - -/* sDMA engines reserved from 0xe0 -0xef */ - AMDGPU_DOORBELL64_sDMA_ENGINE0 =0xE0 , - AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0 =0xE1 , - AMDGPU_DOORBELL64_sDMA_ENGINE1 =0xE8 , - AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE1 =0xE9 , - -/* For vega10 sriov, the sdma doorbell must be fixed as follow -* to keep the same setting with host driver, or it will -* happen conflicts -*/ - AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 =0xF0 , - AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE0 =0xF1 , - AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE1 =0xF2 , - AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE1 =0xF3 , - -/* Interrupt handler */ -AMDGPU_DOORBELL64_IH =0xF4 ,/* For legacy interrupt ring buffer */ -AMDGPU_DOORBELL64_IH_RING1 =0xF5 ,/* For page migration request log */ -AMDGPU_DOORBELL64_IH_RING2 =0xF6 ,/* For page migration translation/invalidation log */ - -/* VCN engine use 32 bits doorbell */ -AMDGPU_DOORBELL64_VCN0_1 =0xF8 ,/* lower 32 bits for VNC0 and upper 32 bits for VNC1 */ -AMDGPU_DOORBELL64_VCN2_3 =0xF9 , -AMDGPU_DOORBELL64_VCN4_5 =0xFA , -AMDGPU_DOORBELL64_VCN6_7 =0xFB , - -/* overlap the doorbell assignment with VCN as they are mutually exclusive -* VCE engine's doorbell is 32 bit and two VCE ring share one QWORD -*/ -AMDGPU_DOORBELL64_UVD_RING0_1 =0xF8 , -AMDGPU_DOORBELL64_UVD_RING2_3 =0xF9 , -AMDGPU_DOORBELL64_UVD_RING4_5 =0xFA , -AMDGPU_DOORBELL64_UVD_RING6_7 =0xFB , - -AMDGPU_DOORBELL64_VCE_RING0_1 =0xFC , -AMDGPU_DOORBELL64_VCE_RING2_3 =0xFD , -AMDGPU_DOORBELL64_VCE_RING4_5 =0xFE , -AMDGPU_DOORBELL64_VCE_RING6_7 =0xFF , - -AMDGPU_DOORBELL64_MAX_ASSIGNMENT =0xFF , -AMDGPU_DOORBELL64_INVALID =0xFFFF -}AMDGPU_DOORBELL64_ASSIGNMENT ; - -/* * IRQS. */
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +8 -19
@@ -181,25 +181,14 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)* process in case of 64-bit doorbells so we * can use each doorbell assignment twice. */ -if (adev->asic_type ==CHIP_VEGA10 ) { - gpu_resources.sdma_doorbell[0 ][i] = - AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 + (i >>1 ); - gpu_resources.sdma_doorbell[0 ][i+1 ] = - AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 +0x200 + (i >>1 ); - gpu_resources.sdma_doorbell[1 ][i] = - AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE1 + (i >>1 ); - gpu_resources.sdma_doorbell[1 ][i+1 ] = - AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE1 +0x200 + (i >>1 ); - }else { - gpu_resources.sdma_doorbell[0 ][i] = - AMDGPU_DOORBELL64_sDMA_ENGINE0 + (i >>1 ); - gpu_resources.sdma_doorbell[0 ][i+1 ] = - AMDGPU_DOORBELL64_sDMA_ENGINE0 +0x200 + (i >>1 ); - gpu_resources.sdma_doorbell[1 ][i] = - AMDGPU_DOORBELL64_sDMA_ENGINE1 + (i >>1 ); - gpu_resources.sdma_doorbell[1 ][i+1 ] = - AMDGPU_DOORBELL64_sDMA_ENGINE1 +0x200 + (i >>1 ); - } + gpu_resources.sdma_doorbell[0 ][i] = + adev->doorbell_index.sdma_engine0 + (i >>1 ); + gpu_resources.sdma_doorbell[0 ][i+1 ] = + adev->doorbell_index.sdma_engine0 +0x200 + (i >>1 ); + gpu_resources.sdma_doorbell[1 ][i] = + adev->doorbell_index.sdma_engine1 + (i >>1 ); + gpu_resources.sdma_doorbell[1 ][i+1 ] = + adev->doorbell_index.sdma_engine1 +0x200 + (i >>1 ); }/* Doorbells 0x0e0-0ff and 0x2e0-2ff are reserved for * SDMA, IH and VCN. So don't use them for the CP.
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
@@ -537,7 +537,7 @@ static int amdgpu_device_doorbell_init(struct amdgpu_device *adev) adev->doorbell.size =pci_resource_len (adev->pdev,2 ); adev->doorbell.num_doorbells =min_t (u32, adev->doorbell.size /sizeof (u32), -AMDGPU_DOORBELL_MAX_ASSIGNMENT +1 ); + adev->doorbell_index.max_assignment+1 );if (adev->doorbell.num_doorbells ==0 )return -EINVAL ;
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1 -1
@@ -250,7 +250,7 @@ int amdgpu_gfx_kiq_init_ring(struct amdgpu_device *adev, ring->adev =NULL ; ring->ring_obj =NULL ; ring->use_doorbell = true; - ring->doorbell_index =AMDGPU_DOORBELL_KIQ ; + ring->doorbell_index = adev->doorbell_index.kiq; r =amdgpu_gfx_kiq_acquire (adev, ring);if (r)
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +1 -1
@@ -4363,7 +4363,7 @@ static int gfx_v7_0_compute_ring_init(struct amdgpu_device *adev, int ring_id, ring->ring_obj =NULL ; ring->use_doorbell = true; - ring->doorbell_index =AMDGPU_DOORBELL_MEC_RING0 + ring_id; + ring->doorbell_index = adev->doorbell_index.mec_ring0 + ring_id;sprintf (ring->name,"comp_%d.%d.%d" , ring->me, ring->pipe, ring->queue); irq_type =AMDGPU_CP_IRQ_COMPUTE_MEC1_PIPE0_EOP
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +5 -5
@@ -1890,7 +1890,7 @@ static int gfx_v8_0_compute_ring_init(struct amdgpu_device *adev, int ring_id, ring->ring_obj =NULL ; ring->use_doorbell = true; - ring->doorbell_index =AMDGPU_DOORBELL_MEC_RING0 + ring_id; + ring->doorbell_index = adev->doorbell_index.mec_ring0 + ring_id; ring->eop_gpu_addr = adev->gfx.mec.hpd_eop_gpu_addr + (ring_id *GFX8_MEC_HPD_SIZE );sprintf (ring->name,"comp_%d.%d.%d" , ring->me, ring->pipe, ring->queue);
@@ -2001,7 +2001,7 @@ static int gfx_v8_0_sw_init(void *handle)/* no gfx doorbells on iceland */ if (adev->asic_type !=CHIP_TOPAZ ) { ring->use_doorbell = true; - ring->doorbell_index =AMDGPU_DOORBELL_GFX_RING0 ; + ring->doorbell_index = adev->doorbell_index.gfx_ring0; } r = amdgpu_ring_init(adev, ring, 1024, &adev->gfx.eop_irq,
@@ -4215,7 +4215,7 @@ static void gfx_v8_0_set_cpg_door_bell(struct amdgpu_device *adev, struct amdgpu tmp =REG_SET_FIELD (0 ,CP_RB_DOORBELL_RANGE_LOWER ,DOORBELL_RANGE_LOWER , -AMDGPU_DOORBELL_GFX_RING0 ); + adev->doorbell_index.gfx_ring0);WREG32 (mmCP_RB_DOORBELL_RANGE_LOWER, tmp); WREG32(mmCP_RB_DOORBELL_RANGE_UPPER,
@@ -4644,8 +4644,8 @@ static int gfx_v8_0_kcq_init_queue(struct amdgpu_ring *ring)static void gfx_v8_0_set_mec_doorbell_range (struct amdgpu_device *adev) {if (adev->asic_type >CHIP_TONGA ) { -WREG32 (mmCP_MEC_DOORBELL_RANGE_LOWER,AMDGPU_DOORBELL_KIQ <<2 ); -WREG32 (mmCP_MEC_DOORBELL_RANGE_UPPER,AMDGPU_DOORBELL_MEC_RING7 <<2 ); +WREG32 (mmCP_MEC_DOORBELL_RANGE_LOWER, adev->doorbell_index.kiq <<2 ); +WREG32 (mmCP_MEC_DOORBELL_RANGE_UPPER, adev->doorbell_index.mec_ring7 <<2 ); }/* enable doorbells */ WREG32_FIELD (CP_PQ_STATUS ,DOORBELL_ENABLE ,1 );
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +4 -4
@@ -1566,7 +1566,7 @@ static int gfx_v9_0_compute_ring_init(struct amdgpu_device *adev, int ring_id, ring->ring_obj =NULL ; ring->use_doorbell = true; - ring->doorbell_index = (AMDGPU_DOORBELL64_MEC_RING0 + ring_id) <<1 ; + ring->doorbell_index = (adev->doorbell_index.mec_ring0 + ring_id) <<1 ; ring->eop_gpu_addr = adev->gfx.mec.hpd_eop_gpu_addr + (ring_id *GFX9_MEC_HPD_SIZE );sprintf (ring->name,"comp_%d.%d.%d" , ring->me, ring->pipe, ring->queue);
@@ -1655,7 +1655,7 @@ static int gfx_v9_0_sw_init(void *handle)else sprintf (ring->name,"gfx_%d" , i); ring->use_doorbell = true; - ring->doorbell_index =AMDGPU_DOORBELL64_GFX_RING0 <<1 ; + ring->doorbell_index = adev->doorbell_index.gfx_ring0 <<1 ; r =amdgpu_ring_init (adev, ring,1024 , &adev->gfx.eop_irq,AMDGPU_CP_IRQ_GFX_EOP );if (r)
@@ -2981,9 +2981,9 @@ static int gfx_v9_0_kiq_init_register(struct amdgpu_ring *ring)/* enable the doorbell if requested */ if (ring->use_doorbell) {WREG32_SOC15 (GC ,0 , mmCP_MEC_DOORBELL_RANGE_LOWER, - (AMDGPU_DOORBELL64_KIQ *2 ) <<2 ); + (adev->doorbell_index.kiq *2 ) <<2 );WREG32_SOC15 (GC ,0 , mmCP_MEC_DOORBELL_RANGE_UPPER, - (AMDGPU_DOORBELL64_USERQUEUE_END *2 ) <<2 ); + (adev->doorbell_index.userqueue_end *2 ) <<2 ); } WREG32_SOC15(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +1 -1
@@ -1146,7 +1146,7 @@ static int sdma_v3_0_sw_init(void *handle)if (!amdgpu_sriov_vf (adev)) { ring->use_doorbell = true; ring->doorbell_index = (i ==0 ) ? - AMDGPU_DOORBELL_sDMA_ENGINE0 : AMDGPU_DOORBELL_sDMA_ENGINE1; + adev->doorbell_index.sdma_engine0 : adev->doorbell_index.sdma_engine1; }else { ring->use_pollmem = true; }
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +9 -16
@@ -1517,15 +1517,13 @@ static int sdma_v4_0_sw_init(void *handle) ring->ring_obj =NULL ; ring->use_doorbell = true; +DRM_INFO ("use_doorbell being set to: [%s]\n" , + ring->use_doorbell?"true" :"false" ); +/* doorbell size is 2 dwords, get DWORD offset */ -if (adev->asic_type ==CHIP_VEGA10 ) - ring->doorbell_index = (i ==0 ) ? - (AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 <<1 ) - : (AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE1 <<1 ); -else - ring->doorbell_index = (i ==0 ) ? - (AMDGPU_DOORBELL64_sDMA_ENGINE0 <<1 ) - : (AMDGPU_DOORBELL64_sDMA_ENGINE1 <<1 ); + ring->doorbell_index = (i ==0 ) ? + (adev->doorbell_index.sdma_engine0 <<1 ) + : (adev->doorbell_index.sdma_engine1 <<1 );sprintf (ring->name,"sdma%d" , i); r = amdgpu_ring_init(adev, ring, 1024,
@@ -1544,14 +1542,9 @@ static int sdma_v4_0_sw_init(void *handle)/* paging queue use same doorbell index/routing as gfx queue * with 0x400 (4096 dwords) offset on second doorbell page */ -if (adev->asic_type ==CHIP_VEGA10 ) - ring->doorbell_index = (i ==0 ) ? - (AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 <<1 ) - : (AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE1 <<1 ); -else - ring->doorbell_index = (i ==0 ) ? - (AMDGPU_DOORBELL64_sDMA_ENGINE0 <<1 ) - : (AMDGPU_DOORBELL64_sDMA_ENGINE1 <<1 ); + ring->doorbell_index = (i ==0 ) ? + (adev->doorbell_index.sdma_engine0 <<1 ) + : (adev->doorbell_index.sdma_engine1 <<1 ); ring->doorbell_index +=0x400 ;sprintf (ring->name,"page%d" , i);
drivers/gpu/drm/amd/amdgpu/tonga_ih.c +1 -1
@@ -322,7 +322,7 @@ static int tonga_ih_sw_init(void *handle)return r; adev->irq.ih.use_doorbell = true; - adev->irq.ih.doorbell_index =AMDGPU_DOORBELL_IH ; + adev->irq.ih.doorbell_index = adev->doorbell_index.ih; r =amdgpu_irq_init (adev);
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +2 -2
@@ -455,9 +455,9 @@ static int uvd_v7_0_sw_init(void *handle)* sriov, so set unused location for other unused rings. */ if (i ==0 ) - ring->doorbell_index =AMDGPU_DOORBELL64_UVD_RING0_1 *2 ; + ring->doorbell_index = adev->doorbell_index.uvd_vce.uvd_ring0_1 *2 ;else - ring->doorbell_index =AMDGPU_DOORBELL64_UVD_RING2_3 *2 +1 ; + ring->doorbell_index = adev->doorbell_index.uvd_vce.uvd_ring2_3 *2 +1 ; } r =amdgpu_ring_init (adev, ring,512 , &adev->uvd.inst[j].irq,0 );if (r)
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +2 -2
@@ -466,9 +466,9 @@ static int vce_v4_0_sw_init(void *handle)* so set unused location for other unused rings. */ if (i ==0 ) - ring->doorbell_index =AMDGPU_DOORBELL64_VCE_RING0_1 *2 ; + ring->doorbell_index = adev->doorbell_index.uvd_vce.vce_ring0_1 *2 ;else - ring->doorbell_index =AMDGPU_DOORBELL64_VCE_RING2_3 *2 +1 ; + ring->doorbell_index = adev->doorbell_index.uvd_vce.vce_ring2_3 *2 +1 ; } r =amdgpu_ring_init (adev, ring,512 , &adev->vce.irq,0 );if (r)
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +1 -1
@@ -385,7 +385,7 @@ static int vega10_ih_sw_init(void *handle)return r; adev->irq.ih.use_doorbell = true; - adev->irq.ih.doorbell_index =AMDGPU_DOORBELL64_IH <<1 ; + adev->irq.ih.doorbell_index = adev->doorbell_index.ih <<1 ; r =amdgpu_irq_init (adev);
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/7 drm/amdgpu: Use new doorbell layout for vega20 and future asic
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + .../drm/amd/amdgpu/vega20_doorbell_index_init.c | 64 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c
drivers/gpu/drm/amd/amdgpu/Makefile +2 -2
@@ -63,8 +63,8 @@ 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 vega10_doorbell_index_init.o vega12_doorbell_index_init.o \ - vi_doorbell_index_init.o + vega20_reg_init.o nbio_v7_4.o vi_doorbell_index_init.o vega10_doorbell_index_init.o \ + vega12_doorbell_index_init.o vega20_doorbell_index_init.o # add DF block amdgpu-y += \
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -1
@@ -517,8 +517,10 @@ static int amdgpu_device_doorbell_init(struct amdgpu_device *adev)vi_doorbell_index_init (adev); else if (adev->asic_type == CHIP_VEGA10) vega10_doorbell_index_init(adev); - else + else if (adev->asic_type == CHIP_VEGA12 || adev->asic_type == CHIP_RAVEN) vega12_doorbell_index_init(adev); + else +vega20_doorbell_index_init (adev );/* No doorbell on SI hardware generation */ if (adev->asic_type <CHIP_BONAIRE ) {
drivers/gpu/drm/amd/amdgpu/soc15.h +1 -0
@@ -60,4 +60,5 @@ int vega20_reg_base_init(struct amdgpu_device *adev);void vega10_doorbell_index_init (struct amdgpu_device *adev);void vega12_doorbell_index_init (struct amdgpu_device *adev); +void vega20_doorbell_index_init (struct amdgpu_device *adev);#endif
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +64 -0
64 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1542815518-8124-7-git-send-email-ozeng-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asic
The doorbell index defines should be compatible with what is used in windows driver . I don't see the necessary to introduce the new init file for this instead of use the original MACRO defines. We need to coordinate with windows driver team for a new user queue SDMA doorbell range and used them for vega20 and future asic .
Regards
shaoyun.liu
Quoted 113 lines · Oak Zeng
Change-Id I04d22fb717ac50483c0835f160a2e860e344f358Signed-off-by Oak Zeng <[email protected]>Suggested-by Felix Kuehling <[email protected]>Suggested-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + .../drm/amd/amdgpu/vega20_doorbell_index_init.c | 64 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 3 deletions(-)create mode 100644
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.cdrivers/gpu/drm/amd/amdgpu/Makefile +2
-2@@ -63,8 +63,8 @@ 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 vega10_doorbell_index_init.o vega12_doorbell_index_init.o \ - vi_doorbell_index_init.o + vega20_reg_init.o nbio_v7_4.o vi_doorbell_index_init.o vega10_doorbell_index_init.o \ + vega12_doorbell_index_init.o vega20_doorbell_index_init.o # add DF block amdgpu-y += \drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-1@@ -517,8 +517,10 @@ static int amdgpu_device_doorbell_init(struct amdgpu_device *adev)vi_doorbell_index_init (adev); else if (adev->asic_type == CHIP_VEGA10) vega10_doorbell_index_init(adev); - else + else if (adev->asic_type == CHIP_VEGA12 || adev->asic_type == CHIP_RAVEN) vega12_doorbell_index_init(adev); + else +vega20_doorbell_index_init (adev );/* No doorbell on SI hardware generation */ if (adev->asic_type <CHIP_BONAIRE ) {drivers/gpu/drm/amd/amdgpu/soc15.h +1
-0@@ -60,4 +60,5 @@ int vega20_reg_base_init(struct amdgpu_device *adev);void vega10_doorbell_index_init (struct amdgpu_device *adev);void vega12_doorbell_index_init (struct amdgpu_device *adev); +void vega20_doorbell_index_init (struct amdgpu_device *adev);#endif drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +54
-0@@ -0,0 +1,64 @@ +/* +* 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 vega20_doorbell_index_init (struct amdgpu_device *adev) +{ +/* Compute + GFX: 0~255 */ + 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 ; +/* SDMA:256~335*/ + adev->doorbell_index.sdma_engine0 =0x100 ; + adev->doorbell_index.sdma_engine1 =0x10a ; + adev->doorbell_index.sdma_engine2 =0x114 ; + adev->doorbell_index.sdma_engine3 =0x11e ; + adev->doorbell_index.sdma_engine4 =0x128 ; + adev->doorbell_index.sdma_engine5 =0x132 ; + adev->doorbell_index.sdma_engine6 =0x13C ; + adev->doorbell_index.sdma_engine7 =0x146 ; +/* IH: 376~391 */ + adev->doorbell_index.ih =0x178 ; +/* MMSCH: 392~407 */ + adev->doorbell_index.uvd_vce.uvd_ring0_1 =0x188 ; + adev->doorbell_index.uvd_vce.uvd_ring2_3 =0x189 ;
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c line 64
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +10
-0+ adev->doorbell_index.uvd_vce.uvd_ring4_5 =0x18a ; + adev->doorbell_index.uvd_vce.uvd_ring6_7 =0x18b ; + adev->doorbell_index.uvd_vce.vce_ring0_1 =0x18c ; + adev->doorbell_index.uvd_vce.vce_ring2_3 =0x18d ; + adev->doorbell_index.uvd_vce.vce_ring4_5 =0x18e ; + adev->doorbell_index.uvd_vce.vce_ring6_7 =0x18f ; +/* In unit of dword doorbell */ + adev->doorbell_index.max_assignment =0x18f <<1 ; +} +
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 76e4deda-4539-4fdb-3e96-3a3b6f668ec7-5C7GfCeVMHo@public.gmane.org
RE: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asic
The new doorbell layout for vega20 was an agreement b/t Felix/Alex and Windows team. Windows team want us to try the new layout first. If it works, they will apply the same layout.
Previously we used a MACRO definitions for doorbell layout. There are 32-bit and 64-bit doorbell layout. Pre-vega10 use 32-bit definition and Vega10 and after use 64-bit definition. All the doorbell layout change need to be backward compatible, otherwise we break compatibility with GIM and the Windows driver on SRIOV. If we do it in the old way, we will have to add a new set of layout for vega20 because the agreed layout for vega20 is totally different. Making doorbell layout asic-specific makes things clear and easy to extend in the future if we want to use different layout for new asics.
The old MACRO definition is pretty messy. Sometimes people might be confusing when to use the 32-bit layout and when 64-bit. I actually found a typo in gfx_v9_0.c where 64-bit doorbell should be used but 32-bit was programmed. If you guys agree, what I can do is, keep the old MACRO definition but do the asic-specific doorbell initialization at the same time?
thanks,
Oak
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Liu, Shaoyun
Sent: Wednesday, November 21, 2018 11:10 AM
To: Zeng, Oak <[email protected]>; [email protected]
Cc: Zeng, Oak <[email protected]>
Subject: Re: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asic
The doorbell index defines should be compatible with what is used in windows driver . I don't see the necessary to introduce the new init file for this instead of use the original MACRO defines. We need to coordinate with windows driver team for a new user queue SDMA doorbell range and used them for vega20 and future asic .
Regards
shaoyun.liu
Quoted 131 lines · Oak Zeng
Change-Id I04d22fb717ac50483c0835f160a2e860e344f358Signed-off-by Oak Zeng <[email protected]>Suggested-by Felix Kuehling <[email protected]>Suggested-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + .../drm/amd/amdgpu/vega20_doorbell_index_init.c | 64 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 3 deletions(-)create mode 100644
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.cdrivers/gpu/drm/amd/amdgpu/Makefile +0
-0@@ -63,8 +63,8 @@ amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.ogfx_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 \drivers/gpu/drm/amd/amdgpu/Makefile +2
-2- vega20_reg_init.o nbio_v7_4.o vega10_doorbell_index_init.o vega12_doorbell_index_init.o \ - vi_doorbell_index_init.o + vega20_reg_init.o nbio_v7_4.o vi_doorbell_index_init.o vega10_doorbell_index_init.o \ + vega12_doorbell_index_init.o vega20_doorbell_index_init.o # add DF block amdgpu-y += \drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4
-1@@ -517,8 +517,10 @@ static int amdgpu_device_doorbell_init(struct amdgpu_device *adev)vi_doorbell_index_init (adev); else if (adev->asic_type == CHIP_VEGA10) vega10_doorbell_index_init(adev); - else + else if (adev->asic_type == CHIP_VEGA12 || adev->asic_type == +CHIP_RAVEN) vega12_doorbell_index_init(adev); + else +vega20_doorbell_index_init (adev );/* No doorbell on SI hardware generation */ if (adev->asic_type < CHIP_BONAIRE) { diff --git
a/drivers/gpu/drm/amd/amdgpu/soc15.hb/drivers/gpu/drm/amd/amdgpu/soc15.h
index 939c0e8..6ba0d26 100644drivers/gpu/drm/amd/amdgpu/soc15.h +1
-0@@ -60,4 +60,5 @@ int vega20_reg_base_init(struct amdgpu_device *adev);void vega10_doorbell_index_init (struct amdgpu_device *adev);void vega12_doorbell_index_init (struct amdgpu_device *adev); +void vega20_doorbell_index_init (struct amdgpu_device *adev);#endifdrivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +64
-0@@ -0,0 +1,64 @@ +/* +* 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 vega20_doorbell_index_init (struct amdgpu_device *adev) { +/* Compute + GFX: 0~255 */ + 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 ; +/* SDMA:256~335*/ + adev->doorbell_index.sdma_engine0 =0x100 ; + adev->doorbell_index.sdma_engine1 =0x10a ; + adev->doorbell_index.sdma_engine2 =0x114 ; + adev->doorbell_index.sdma_engine3 =0x11e ; + adev->doorbell_index.sdma_engine4 =0x128 ; + adev->doorbell_index.sdma_engine5 =0x132 ; + adev->doorbell_index.sdma_engine6 =0x13C ; + adev->doorbell_index.sdma_engine7 =0x146 ; +/* IH: 376~391 */ + adev->doorbell_index.ih =0x178 ; +/* MMSCH: 392~407 */ + adev->doorbell_index.uvd_vce.uvd_ring0_1 =0x188 ;
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c line 64
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +10
-0+ adev->doorbell_index.uvd_vce.uvd_ring2_3 =0x189 ; + adev->doorbell_index.uvd_vce.uvd_ring4_5 =0x18a ; + adev->doorbell_index.uvd_vce.uvd_ring6_7 =0x18b ; + adev->doorbell_index.uvd_vce.vce_ring0_1 =0x18c ; + adev->doorbell_index.uvd_vce.vce_ring2_3 =0x18d ; + adev->doorbell_index.uvd_vce.vce_ring4_5 =0x18e ; + adev->doorbell_index.uvd_vce.vce_ring6_7 =0x18f ; +/* In unit of dword doorbell */ + adev->doorbell_index.max_assignment =0x18f <<1 ; } +
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asic
In reply to a message not in the archiveQuoted 113 lines · Oak Zeng
Change-Id I04d22fb717ac50483c0835f160a2e860e344f358Signed-off-by Oak Zeng <[email protected]>Suggested-by Felix Kuehling <[email protected]>Suggested-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + .../drm/amd/amdgpu/vega20_doorbell_index_init.c | 64 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.cdrivers/gpu/drm/amd/amdgpu/Makefile +2
-2@@ -63,8 +63,8 @@ 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 vega10_doorbell_index_init.o vega12_doorbell_index_init.o \ - vi_doorbell_index_init.o + vega20_reg_init.o nbio_v7_4.o vi_doorbell_index_init.o vega10_doorbell_index_init.o \ + vega12_doorbell_index_init.o vega20_doorbell_index_init.o # add DF block amdgpu-y += \drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-1@@ -517,8 +517,10 @@ static int amdgpu_device_doorbell_init(struct amdgpu_device *adev)vi_doorbell_index_init (adev); else if (adev->asic_type == CHIP_VEGA10) vega10_doorbell_index_init(adev); - else + else if (adev->asic_type == CHIP_VEGA12 || adev->asic_type == CHIP_RAVEN) vega12_doorbell_index_init(adev); + else +vega20_doorbell_index_init (adev );/* No doorbell on SI hardware generation */ if (adev->asic_type <CHIP_BONAIRE ) {drivers/gpu/drm/amd/amdgpu/soc15.h +1
-0@@ -60,4 +60,5 @@ int vega20_reg_base_init(struct amdgpu_device *adev);void vega10_doorbell_index_init (struct amdgpu_device *adev);void vega12_doorbell_index_init (struct amdgpu_device *adev); +void vega20_doorbell_index_init (struct amdgpu_device *adev);#endif drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +53
-0@@ -0,0 +1,64 @@ +/* +* 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 vega20_doorbell_index_init (struct amdgpu_device *adev) +{ +/* Compute + GFX: 0~255 */ + 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 ; +/* SDMA:256~335*/ + adev->doorbell_index.sdma_engine0 =0x100 ; + adev->doorbell_index.sdma_engine1 =0x10a ; + adev->doorbell_index.sdma_engine2 =0x114 ; + adev->doorbell_index.sdma_engine3 =0x11e ; + adev->doorbell_index.sdma_engine4 =0x128 ; + adev->doorbell_index.sdma_engine5 =0x132 ; + adev->doorbell_index.sdma_engine6 =0x13C ; + adev->doorbell_index.sdma_engine7 =0x146 ; +/* IH: 376~391 */ + adev->doorbell_index.ih =0x178 ; +/* MMSCH: 392~407 */ + adev->doorbell_index.uvd_vce.uvd_ring0_1 =0x188 ;
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c line 63
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +10
-0+ adev->doorbell_index.uvd_vce.uvd_ring2_3 =0x189 ; + adev->doorbell_index.uvd_vce.uvd_ring4_5 =0x18a ; + adev->doorbell_index.uvd_vce.uvd_ring6_7 =0x18b ; + adev->doorbell_index.uvd_vce.vce_ring0_1 =0x18c ; + adev->doorbell_index.uvd_vce.vce_ring2_3 =0x18d ; + adev->doorbell_index.uvd_vce.vce_ring4_5 =0x18e ; + adev->doorbell_index.uvd_vce.vce_ring6_7 =0x18f ; +/* In unit of dword doorbell */ + adev->doorbell_index.max_assignment =0x18f <<1 ; +}
No need to add a new file for this. Just add this to vega20_reg_init.c. Also, please use the doorbell enums rather than hardcoding the numbers.
Alex
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +1
-1+ --2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): CADnq5_M6+jQpJGF0wscUP917QWbDSwCQTF4TYMTtTXp2vsKXEQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
RE: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asic
Quoted 1 line
No need to add a new file for this. Just add this to
vega20_reg_init.c.
Agreed.
Quoted 1 line
Also, please use the doorbell enums rather than hardcoding the numbers.
Ok. Where should I put the doorbell enums for vega20? In amdgpu.h or in vega20_reg_init.c?
thanks,
Oak
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Wednesday, November 21, 2018 11:22 AM
To: Zeng, Oak <[email protected]>
Cc: Zeng, Oak <[email protected]>; amd-gfx list <[email protected]>
Subject: Re: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asic
Quoted 130 lines · Oak Zeng
Change-Id I04d22fb717ac50483c0835f160a2e860e344f358Signed-off-by Oak Zeng <[email protected]>Suggested-by Felix Kuehling <[email protected]>Suggested-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + .../drm/amd/amdgpu/vega20_doorbell_index_init.c | 64 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 3 deletions(-) create mode 100644
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.cdrivers/gpu/drm/amd/amdgpu/Makefile +0
-0@@ -63,8 +63,8 @@ amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.ogfx_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 \drivers/gpu/drm/amd/amdgpu/Makefile +2
-2- vega20_reg_init.o nbio_v7_4.o vega10_doorbell_index_init.o vega12_doorbell_index_init.o \ - vi_doorbell_index_init.o + vega20_reg_init.o nbio_v7_4.o vi_doorbell_index_init.o vega10_doorbell_index_init.o \ + vega12_doorbell_index_init.o vega20_doorbell_index_init.o # add DF block amdgpu-y += \drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4
-1@@ -517,8 +517,10 @@ static int amdgpu_device_doorbell_init(struct amdgpu_device *adev)vi_doorbell_index_init (adev); else if (adev->asic_type == CHIP_VEGA10) vega10_doorbell_index_init(adev); - else + else if (adev->asic_type == CHIP_VEGA12 || adev->asic_type == + CHIP_RAVEN) vega12_doorbell_index_init(adev); + else +vega20_doorbell_index_init (adev );/* No doorbell on SI hardware generation */ if (adev->asic_type < CHIP_BONAIRE) { diff --git
a/drivers/gpu/drm/amd/amdgpu/soc15.hb/drivers/gpu/drm/amd/amdgpu/soc15.h
index 939c0e8..6ba0d26 100644drivers/gpu/drm/amd/amdgpu/soc15.h +1
-0@@ -60,4 +60,5 @@ int vega20_reg_base_init(struct amdgpu_device *adev);void vega10_doorbell_index_init (struct amdgpu_device *adev);void vega12_doorbell_index_init (struct amdgpu_device *adev); +void vega20_doorbell_index_init (struct amdgpu_device *adev);#endif
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +63
-0@@ -0,0 +1,64 @@ +/* +* 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 vega20_doorbell_index_init (struct amdgpu_device *adev) { +/* Compute + GFX: 0~255 */ + 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 ; +/* SDMA:256~335*/ + adev->doorbell_index.sdma_engine0 =0x100 ; + adev->doorbell_index.sdma_engine1 =0x10a ; + adev->doorbell_index.sdma_engine2 =0x114 ; + adev->doorbell_index.sdma_engine3 =0x11e ; + adev->doorbell_index.sdma_engine4 =0x128 ; + adev->doorbell_index.sdma_engine5 =0x132 ; + adev->doorbell_index.sdma_engine6 =0x13C ; + adev->doorbell_index.sdma_engine7 =0x146 ; +/* IH: 376~391 */ + adev->doorbell_index.ih =0x178 ; +/* MMSCH: 392~407 */
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +10
-0+ adev->doorbell_index.uvd_vce.uvd_ring0_1 =0x188 ; + adev->doorbell_index.uvd_vce.uvd_ring2_3 =0x189 ; + adev->doorbell_index.uvd_vce.uvd_ring4_5 =0x18a ; + adev->doorbell_index.uvd_vce.uvd_ring6_7 =0x18b ; + adev->doorbell_index.uvd_vce.vce_ring0_1 =0x18c ; + adev->doorbell_index.uvd_vce.vce_ring2_3 =0x18d ; + adev->doorbell_index.uvd_vce.vce_ring4_5 =0x18e ; + adev->doorbell_index.uvd_vce.vce_ring6_7 =0x18f ; +/* In unit of dword doorbell */ + adev->doorbell_index.max_assignment =0x18f <<1 ; }
No need to add a new file for this. Just add this to vega20_reg_init.c. Also, please use the doorbell enums rather than hardcoding the numbers.
Alex
Quoted 8 lines
+
--
2.7.4_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): BN6PR12MB1651198C70B58BE69A44EBFF80DA0-/b2+HYfkarRSqX7PDniLCgdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Re: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asic
Quoted 6 lines · Oak
Quoted 2 lines
No need to add a new file for this. Just add this to
vega20_reg_init.c.Agreed.
Quoted 1 line
Also, please use the doorbell enums rather than hardcoding the numbers.
Ok. Where should I put the doorbell enums for vega20? In
amdgpu.hor invega20_reg_init.c?
Maybe add amdgpu_doorbell.h and move all of the enums there?
Alex
Quoted 161 lines
thanks,
Oak-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Wednesday, November 21, 2018 11:22 AM
To: Zeng, Oak <[email protected]>
Cc: Zeng, Oak <[email protected]>; amd-gfx list <[email protected]>
Subject: Re: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asicQuoted 130 lines · Oak Zeng
Change-Id I04d22fb717ac50483c0835f160a2e860e344f358Signed-off-by Oak Zeng <[email protected]>Suggested-by Felix Kuehling <[email protected]>Suggested-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + .../drm/amd/amdgpu/vega20_doorbell_index_init.c | 64 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 3 deletions(-) create mode 100644
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.cdrivers/gpu/drm/amd/amdgpu/Makefile +0
-0@@ -63,8 +63,8 @@ amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.ogfx_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 \drivers/gpu/drm/amd/amdgpu/Makefile +2
-2- vega20_reg_init.o nbio_v7_4.o vega10_doorbell_index_init.o vega12_doorbell_index_init.o \ - vi_doorbell_index_init.o + vega20_reg_init.o nbio_v7_4.o vi_doorbell_index_init.o vega10_doorbell_index_init.o \ + vega12_doorbell_index_init.o vega20_doorbell_index_init.o # add DF block amdgpu-y += \drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4
-1@@ -517,8 +517,10 @@ static int amdgpu_device_doorbell_init(struct amdgpu_device *adev)vi_doorbell_index_init (adev); else if (adev->asic_type == CHIP_VEGA10) vega10_doorbell_index_init(adev); - else + else if (adev->asic_type == CHIP_VEGA12 || adev->asic_type == + CHIP_RAVEN) vega12_doorbell_index_init(adev); + else +vega20_doorbell_index_init (adev );/* No doorbell on SI hardware generation */ if (adev->asic_type < CHIP_BONAIRE) { diff --git
a/drivers/gpu/drm/amd/amdgpu/soc15.hb/drivers/gpu/drm/amd/amdgpu/soc15.h
index 939c0e8..6ba0d26 100644drivers/gpu/drm/amd/amdgpu/soc15.h +1
-0@@ -60,4 +60,5 @@ int vega20_reg_base_init(struct amdgpu_device *adev);void vega10_doorbell_index_init (struct amdgpu_device *adev);void vega12_doorbell_index_init (struct amdgpu_device *adev); +void vega20_doorbell_index_init (struct amdgpu_device *adev);#endif
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +63
-0@@ -0,0 +1,64 @@ +/* +* 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 vega20_doorbell_index_init (struct amdgpu_device *adev) { +/* Compute + GFX: 0~255 */ + 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 ; +/* SDMA:256~335*/ + adev->doorbell_index.sdma_engine0 =0x100 ; + adev->doorbell_index.sdma_engine1 =0x10a ; + adev->doorbell_index.sdma_engine2 =0x114 ; + adev->doorbell_index.sdma_engine3 =0x11e ; + adev->doorbell_index.sdma_engine4 =0x128 ; + adev->doorbell_index.sdma_engine5 =0x132 ; + adev->doorbell_index.sdma_engine6 =0x13C ; + adev->doorbell_index.sdma_engine7 =0x146 ; +/* IH: 376~391 */ + adev->doorbell_index.ih =0x178 ; +/* MMSCH: 392~407 */ drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +10
-0+ adev->doorbell_index.uvd_vce.uvd_ring0_1 =0x188 ; + adev->doorbell_index.uvd_vce.uvd_ring2_3 =0x189 ; + adev->doorbell_index.uvd_vce.uvd_ring4_5 =0x18a ; + adev->doorbell_index.uvd_vce.uvd_ring6_7 =0x18b ; + adev->doorbell_index.uvd_vce.vce_ring0_1 =0x18c ; + adev->doorbell_index.uvd_vce.vce_ring2_3 =0x18d ; + adev->doorbell_index.uvd_vce.vce_ring4_5 =0x18e ; + adev->doorbell_index.uvd_vce.vce_ring6_7 =0x18f ; +/* In unit of dword doorbell */ + adev->doorbell_index.max_assignment =0x18f <<1 ; }No need to add a new file for this. Just add this to
vega20_reg_init.c. Also, please use the doorbell enums rather than hardcoding the numbers.Alex
Quoted 4 lines
+
--
2.7.4
Quoted 8 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): CADnq5_Omgd=yLKuqpb8-ZsrBJdjkEord0OL0WwVpXXcntQaB1A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asic
Am 21.11.18 um 17:39 schrieb Alex Deucher:
Quoted 7 lines · Oak
Quoted 5 lines
Quoted 1 line
No need to add a new file for this. Just add this to
vega20_reg_init.c.Agreed.
Quoted 1 line
Also, please use the doorbell enums rather than hardcoding the numbers.
Ok. Where should I put the doorbell enums for vega20? In
amdgpu.hor invega20_reg_init.c?Maybe add
amdgpu_doorbell.hand move all of the enums there?
Mhm, isn't part of the goal of this work to get rid of the enums?
I mean when we have a structure to hold the indexes to we really need the enums any more? I don't think so.
Christian.
Quoted 165 lines
Alex
Quoted 162 lines
thanks,
Oak-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Wednesday, November 21, 2018 11:22 AM
To: Zeng, Oak <[email protected]>
Cc: Zeng, Oak <[email protected]>; amd-gfx list <[email protected]>
Subject: Re: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asicQuoted 129 lines · Oak Zeng
Change-Id I04d22fb717ac50483c0835f160a2e860e344f358Signed-off-by Oak Zeng <[email protected]>Suggested-by Felix Kuehling <[email protected]>Suggested-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + .../drm/amd/amdgpu/vega20_doorbell_index_init.c | 64 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 3 deletions(-) create mode 100644
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.cdrivers/gpu/drm/amd/amdgpu/Makefile +0
-0@@ -63,8 +63,8 @@ amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.ogfx_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 \drivers/gpu/drm/amd/amdgpu/Makefile +2
-2- vega20_reg_init.o nbio_v7_4.o vega10_doorbell_index_init.o vega12_doorbell_index_init.o \ - vi_doorbell_index_init.o + vega20_reg_init.o nbio_v7_4.o vi_doorbell_index_init.o vega10_doorbell_index_init.o \ + vega12_doorbell_index_init.o vega20_doorbell_index_init.o # add DF block amdgpu-y += \drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4
-1@@ -517,8 +517,10 @@ static int amdgpu_device_doorbell_init(struct amdgpu_device *adev)vi_doorbell_index_init (adev); else if (adev->asic_type == CHIP_VEGA10) vega10_doorbell_index_init(adev); - else + else if (adev->asic_type == CHIP_VEGA12 || adev->asic_type == + CHIP_RAVEN) vega12_doorbell_index_init(adev); + else +vega20_doorbell_index_init (adev );/* No doorbell on SI hardware generation */ if (adev->asic_type < CHIP_BONAIRE) { diff --git
a/drivers/gpu/drm/amd/amdgpu/soc15.hb/drivers/gpu/drm/amd/amdgpu/soc15.h
index 939c0e8..6ba0d26 100644drivers/gpu/drm/amd/amdgpu/soc15.h +1
-0@@ -60,4 +60,5 @@ int vega20_reg_base_init(struct amdgpu_device *adev);void vega10_doorbell_index_init (struct amdgpu_device *adev);void vega12_doorbell_index_init (struct amdgpu_device *adev); +void vega20_doorbell_index_init (struct amdgpu_device *adev);#endifdrivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +63
-0@@ -0,0 +1,64 @@ +/* +* 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 vega20_doorbell_index_init (struct amdgpu_device *adev) { +/* Compute + GFX: 0~255 */ + 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 ; +/* SDMA:256~335*/ + adev->doorbell_index.sdma_engine0 =0x100 ; + adev->doorbell_index.sdma_engine1 =0x10a ; + adev->doorbell_index.sdma_engine2 =0x114 ; + adev->doorbell_index.sdma_engine3 =0x11e ; + adev->doorbell_index.sdma_engine4 =0x128 ; + adev->doorbell_index.sdma_engine5 =0x132 ; + adev->doorbell_index.sdma_engine6 =0x13C ; + adev->doorbell_index.sdma_engine7 =0x146 ; +/* IH: 376~391 */ + adev->doorbell_index.ih =0x178 ; +/* MMSCH: 392~407 */ drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +10
-0+ adev->doorbell_index.uvd_vce.uvd_ring0_1 =0x188 ; + adev->doorbell_index.uvd_vce.uvd_ring2_3 =0x189 ; + adev->doorbell_index.uvd_vce.uvd_ring4_5 =0x18a ; + adev->doorbell_index.uvd_vce.uvd_ring6_7 =0x18b ; + adev->doorbell_index.uvd_vce.vce_ring0_1 =0x18c ; + adev->doorbell_index.uvd_vce.vce_ring2_3 =0x18d ; + adev->doorbell_index.uvd_vce.vce_ring4_5 =0x18e ; + adev->doorbell_index.uvd_vce.vce_ring6_7 =0x18f ; +/* In unit of dword doorbell */ + adev->doorbell_index.max_assignment =0x18f <<1 ; }No need to add a new file for this. Just add this to
vega20_reg_init.c. Also, please use the doorbell enums rather than hardcoding the numbers.Alex
Quoted 8 lines
+
--
2.7.4_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 8 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 5a171836-f0bc-4edf-db9d-51746e8c9c4e-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Re: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asic
The main idea is to be able to use different layouts on different asics that may share the same IP code.
Alex
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Christian K?nig <[email protected]>
Sent: Thursday, November 22, 2018 4:26:53 AM
To: Alex Deucher; Zeng, Oak
Cc: amd-gfx list
Subject: Re: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asic
Am 21.11.18 um 17:39 schrieb Alex Deucher:
Quoted 7 lines · Oak
Quoted 5 lines
Quoted 1 line
No need to add a new file for this. Just add this to
vega20_reg_init.c.Agreed.
Quoted 1 line
Also, please use the doorbell enums rather than hardcoding the numbers.
Ok. Where should I put the doorbell enums for vega20? In
amdgpu.hor invega20_reg_init.c?Maybe add
amdgpu_doorbell.hand move all of the enums there?
Mhm, isn't part of the goal of this work to get rid of the enums?
I mean when we have a structure to hold the indexes to we really need the enums any more? I don't think so.
Christian.
Quoted 165 lines
Alex
Quoted 162 lines
thanks,
Oak-----Original Message-----
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> On Behalf Of Alex Deucher
Sent: Wednesday, November 21, 2018 11:22 AM
To: Zeng, Oak <[email protected]>
Cc: Zeng, Oak <[email protected]>; amd-gfx list <[email protected]>
Subject: Re: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asicQuoted 129 lines · Oak Zeng
Change-Id I04d22fb717ac50483c0835f160a2e860e344f358Signed-off-by Oak Zeng <[email protected]>Suggested-by Felix Kuehling <[email protected]>Suggested-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + .../drm/amd/amdgpu/vega20_doorbell_index_init.c | 64 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 3 deletions(-) create mode 100644
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.cdrivers/gpu/drm/amd/amdgpu/Makefile +0
-0@@ -63,8 +63,8 @@ amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.ogfx_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 \drivers/gpu/drm/amd/amdgpu/Makefile +2
-2- vega20_reg_init.o nbio_v7_4.o vega10_doorbell_index_init.o vega12_doorbell_index_init.o \ - vi_doorbell_index_init.o + vega20_reg_init.o nbio_v7_4.o vi_doorbell_index_init.o vega10_doorbell_index_init.o \ + vega12_doorbell_index_init.o vega20_doorbell_index_init.o # add DF block amdgpu-y += \drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4
-1@@ -517,8 +517,10 @@ static int amdgpu_device_doorbell_init(struct amdgpu_device *adev)vi_doorbell_index_init (adev); else if (adev->asic_type == CHIP_VEGA10) vega10_doorbell_index_init(adev); - else + else if (adev->asic_type == CHIP_VEGA12 || adev->asic_type == + CHIP_RAVEN) vega12_doorbell_index_init(adev); + else +vega20_doorbell_index_init (adev );/* No doorbell on SI hardware generation */ if (adev->asic_type < CHIP_BONAIRE) { diff --git
a/drivers/gpu/drm/amd/amdgpu/soc15.hb/drivers/gpu/drm/amd/amdgpu/soc15.h
index 939c0e8..6ba0d26 100644drivers/gpu/drm/amd/amdgpu/soc15.h +1
-0@@ -60,4 +60,5 @@ int vega20_reg_base_init(struct amdgpu_device *adev);void vega10_doorbell_index_init (struct amdgpu_device *adev);void vega12_doorbell_index_init (struct amdgpu_device *adev); +void vega20_doorbell_index_init (struct amdgpu_device *adev);#endifdrivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +63
-0@@ -0,0 +1,64 @@ +/* +* 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 vega20_doorbell_index_init (struct amdgpu_device *adev) { +/* Compute + GFX: 0~255 */ + 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 ; +/* SDMA:256~335*/ + adev->doorbell_index.sdma_engine0 =0x100 ; + adev->doorbell_index.sdma_engine1 =0x10a ; + adev->doorbell_index.sdma_engine2 =0x114 ; + adev->doorbell_index.sdma_engine3 =0x11e ; + adev->doorbell_index.sdma_engine4 =0x128 ; + adev->doorbell_index.sdma_engine5 =0x132 ; + adev->doorbell_index.sdma_engine6 =0x13C ; + adev->doorbell_index.sdma_engine7 =0x146 ; +/* IH: 376~391 */ + adev->doorbell_index.ih =0x178 ; +/* MMSCH: 392~407 */ drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +10
-0+ adev->doorbell_index.uvd_vce.uvd_ring0_1 =0x188 ; + adev->doorbell_index.uvd_vce.uvd_ring2_3 =0x189 ; + adev->doorbell_index.uvd_vce.uvd_ring4_5 =0x18a ; + adev->doorbell_index.uvd_vce.uvd_ring6_7 =0x18b ; + adev->doorbell_index.uvd_vce.vce_ring0_1 =0x18c ; + adev->doorbell_index.uvd_vce.vce_ring2_3 =0x18d ; + adev->doorbell_index.uvd_vce.vce_ring4_5 =0x18e ; + adev->doorbell_index.uvd_vce.vce_ring6_7 =0x18f ; +/* In unit of dword doorbell */ + adev->doorbell_index.max_assignment =0x18f <<1 ; }No need to add a new file for this. Just add this to
vega20_reg_init.c. Also, please use the doorbell enums rather than hardcoding the numbers.Alex
Quoted 8 lines
+
--
2.7.4_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 8 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): BN6PR12MB180946F99B5AA562E542C4EBF7D40-/b2+HYfkarSEx6ez0IUAagdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
RE: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asic
Hi Alex,
It is strange I didn't get your email on Wednesday. I will add one patch to move all the doorbell definitions to a separate amdgpu_doorbell.h
Regards,
Oak
From: Deucher, Alexander <[email protected]>
Sent: Friday, November 23, 2018 1:57 PM
To: Alex Deucher <[email protected]>; Zeng, Oak <[email protected]>; Koenig, Christian <[email protected]>
Cc: amd-gfx list <[email protected]>
Subject: Re: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asic
The main idea is to be able to use different layouts on different asics that may share the same IP code.
Alex
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org<mailto:[email protected]>> on behalf of Christian König <[email protected]<mailto:[email protected]>>
Sent: Thursday, November 22, 2018 4:26:53 AM
To: Alex Deucher; Zeng, Oak
Cc: amd-gfx list
Subject: Re: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asic
Am 21.11.18 um 17:39 schrieb Alex Deucher:
Quoted 7 lines · On Wed, Nov 21, 2018 at 11:37 AM Zeng, Oak…
Quoted 5 lines
Quoted 1 line
No need to add a new file for this. Just add this to
vega20_reg_init.c.Agreed.
Quoted 1 line
Also, please use the doorbell enums rather than hardcoding the numbers.
Ok. Where should I put the doorbell enums for vega20? In
amdgpu.hor invega20_reg_init.c?Maybe add
amdgpu_doorbell.hand move all of the enums there?
Mhm, isn't part of the goal of this work to get rid of the enums?
I mean when we have a structure to hold the indexes to we really need the enums any more? I don't think so.
Christian.
Quoted 165 lines
Alex
Quoted 162 lines
thanks,
Oak-----Original Message-----
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org<mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>> On Behalf Of Alex Deucher
Sent: Wednesday, November 21, 2018 11:22 AM
To: Zeng, Oak <[email protected]<mailto:[email protected]>>
Cc: Zeng, Oak <[email protected]<mailto:[email protected]>>; amd-gfx list <[email protected]<mailto:[email protected]>>
Subject: Re: [PATCH 7/7] drm/amdgpu: Use new doorbell layout for vega20 and future asicQuoted 129 lines · On Wed, Nov 21, 2018 at 10:52 AM Oak Zeng…
Change-Id I04d22fb717ac50483c0835f160a2e860e344f358Signed-off-by Oak Zeng <[email protected]<mailto:[email protected]>>--- drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + .../drm/amd/amdgpu/vega20_doorbell_index_init.c | 64 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 3 deletions(-) create mode 100644
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.cdrivers/gpu/drm/amd/amdgpu/Makefile +0
-0@@ -63,8 +63,8 @@ amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.ogfx_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 \drivers/gpu/drm/amd/amdgpu/Makefile +2
-2- vega20_reg_init.o nbio_v7_4.o vega10_doorbell_index_init.o vega12_doorbell_index_init.o \ - vi_doorbell_index_init.o + vega20_reg_init.o nbio_v7_4.o vi_doorbell_index_init.o vega10_doorbell_index_init.o \ + vega12_doorbell_index_init.o vega20_doorbell_index_init.o # add DF block amdgpu-y += \drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4
-1@@ -517,8 +517,10 @@ static int amdgpu_device_doorbell_init(struct amdgpu_device *adev)vi_doorbell_index_init (adev); else if (adev->asic_type == CHIP_VEGA10) vega10_doorbell_index_init(adev); - else + else if (adev->asic_type == CHIP_VEGA12 || adev->asic_type == + CHIP_RAVEN) vega12_doorbell_index_init(adev); + else +vega20_doorbell_index_init (adev );/* No doorbell on SI hardware generation */ if (adev->asic_type < CHIP_BONAIRE) { diff --git
a/drivers/gpu/drm/amd/amdgpu/soc15.hb/drivers/gpu/drm/amd/amdgpu/soc15.h
index 939c0e8..6ba0d26 100644drivers/gpu/drm/amd/amdgpu/soc15.h +1
-0@@ -60,4 +60,5 @@ int vega20_reg_base_init(struct amdgpu_device *adev);void vega10_doorbell_index_init (struct amdgpu_device *adev);void vega12_doorbell_index_init (struct amdgpu_device *adev); +void vega20_doorbell_index_init (struct amdgpu_device *adev);#endifdrivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +63
-0@@ -0,0 +1,64 @@ +/* +* 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 vega20_doorbell_index_init (struct amdgpu_device *adev) { +/* Compute + GFX: 0~255 */ + 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 ; +/* SDMA:256~335*/ + adev->doorbell_index.sdma_engine0 =0x100 ; + adev->doorbell_index.sdma_engine1 =0x10a ; + adev->doorbell_index.sdma_engine2 =0x114 ; + adev->doorbell_index.sdma_engine3 =0x11e ; + adev->doorbell_index.sdma_engine4 =0x128 ; + adev->doorbell_index.sdma_engine5 =0x132 ; + adev->doorbell_index.sdma_engine6 =0x13C ; + adev->doorbell_index.sdma_engine7 =0x146 ; +/* IH: 376~391 */ + adev->doorbell_index.ih =0x178 ; +/* MMSCH: 392~407 */ drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vega20_doorbell_index_init.c new file +10
-0+ adev->doorbell_index.uvd_vce.uvd_ring0_1 =0x188 ; + adev->doorbell_index.uvd_vce.uvd_ring2_3 =0x189 ; + adev->doorbell_index.uvd_vce.uvd_ring4_5 =0x18a ; + adev->doorbell_index.uvd_vce.uvd_ring6_7 =0x18b ; + adev->doorbell_index.uvd_vce.vce_ring0_1 =0x18c ; + adev->doorbell_index.uvd_vce.vce_ring2_3 =0x18d ; + adev->doorbell_index.uvd_vce.vce_ring4_5 =0x18e ; + adev->doorbell_index.uvd_vce.vce_ring6_7 =0x18f ; +/* In unit of dword doorbell */ + adev->doorbell_index.max_assignment =0x18f <<1 ; }No need to add a new file for this. Just add this to
vega20_reg_init.c. Also, please use the doorbell enums rather than hardcoding the numbers.Alex
Quoted 8 lines
+
--
2.7.4_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 8 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx