Commit b608e785 authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdgpu: allocate doorbell index for mes kiq 



Allocate a doorbell index for mes kiq queue.

Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 928fe236

drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h

+4 −2
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ struct amdgpu_doorbell_index { 
	uint32_t gfx_ring0;

	uint32_t gfx_ring1;

	uint32_t sdma_engine[8];

	uint32_t mes_ring;

	uint32_t mes_ring0;

	uint32_t mes_ring1;

	uint32_t ih;

	union {

		struct {
@@ -178,7 +179,8 @@ typedef enum _AMDGPU_NAVI10_DOORBELL_ASSIGNMENT 
	AMDGPU_NAVI10_DOORBELL_USERQUEUE_END		= 0x08A,

	AMDGPU_NAVI10_DOORBELL_GFX_RING0		= 0x08B,

	AMDGPU_NAVI10_DOORBELL_GFX_RING1		= 0x08C,

	AMDGPU_NAVI10_DOORBELL_MES_RING		        = 0x090,

	AMDGPU_NAVI10_DOORBELL_MES_RING0	        = 0x090,

	AMDGPU_NAVI10_DOORBELL_MES_RING1		= 0x091,

	/* SDMA:256~335*/

	AMDGPU_NAVI10_DOORBELL_sDMA_ENGINE0		= 0x100,

	AMDGPU_NAVI10_DOORBELL_sDMA_ENGINE1		= 0x10A,

drivers/gpu/drm/amd/amdgpu/nv.c

+2 −1
Original line number Diff line number Diff line
@@ -607,7 +607,8 @@ static void nv_init_doorbell_index(struct amdgpu_device *adev) 
	adev->doorbell_index.userqueue_end = AMDGPU_NAVI10_DOORBELL_USERQUEUE_END;

	adev->doorbell_index.gfx_ring0 = AMDGPU_NAVI10_DOORBELL_GFX_RING0;

	adev->doorbell_index.gfx_ring1 = AMDGPU_NAVI10_DOORBELL_GFX_RING1;

	adev->doorbell_index.mes_ring = AMDGPU_NAVI10_DOORBELL_MES_RING;

	adev->doorbell_index.mes_ring0 = AMDGPU_NAVI10_DOORBELL_MES_RING0;

	adev->doorbell_index.mes_ring1 = AMDGPU_NAVI10_DOORBELL_MES_RING1;

	adev->doorbell_index.sdma_engine[0] = AMDGPU_NAVI10_DOORBELL_sDMA_ENGINE0;

	adev->doorbell_index.sdma_engine[1] = AMDGPU_NAVI10_DOORBELL_sDMA_ENGINE1;

	adev->doorbell_index.sdma_engine[2] = AMDGPU_NAVI10_DOORBELL_sDMA_ENGINE2;

drivers/gpu/drm/amd/amdgpu/soc21.c

+2 −1
Original line number Diff line number Diff line
@@ -409,7 +409,8 @@ static void soc21_init_doorbell_index(struct amdgpu_device *adev) 
	adev->doorbell_index.userqueue_end = AMDGPU_NAVI10_DOORBELL_USERQUEUE_END;

	adev->doorbell_index.gfx_ring0 = AMDGPU_NAVI10_DOORBELL_GFX_RING0;

	adev->doorbell_index.gfx_ring1 = AMDGPU_NAVI10_DOORBELL_GFX_RING1;

	adev->doorbell_index.mes_ring = AMDGPU_NAVI10_DOORBELL_MES_RING;

	adev->doorbell_index.mes_ring0 = AMDGPU_NAVI10_DOORBELL_MES_RING0;

	adev->doorbell_index.mes_ring1 = AMDGPU_NAVI10_DOORBELL_MES_RING1;

	adev->doorbell_index.sdma_engine[0] = AMDGPU_NAVI10_DOORBELL_sDMA_ENGINE0;

	adev->doorbell_index.sdma_engine[1] = AMDGPU_NAVI10_DOORBELL_sDMA_ENGINE1;

	adev->doorbell_index.ih = AMDGPU_NAVI10_DOORBELL_IH;