Revert "drm/amdgpu: Delete user queue doorbell variables"

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

This reverts commit 9006c6bd9059cb9807fa863bafc1d776222cb61b.

Signed-off-by: Yong Zhao <Yong.Zhao@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Yong Zhao and committed by

Alex Deucher 7 years ago e02c80d6 cc5034a5

+12

3 changed files

expand all

drivers

gpu

drm

amd

amdgpu

amdgpu_doorbell.h

vega10_reg_init.c

vega20_reg_init.c

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

··· 48 48 uint32_t mec_ring5; 49 49 uint32_t mec_ring6; 50 50 uint32_t mec_ring7; 51 + uint32_t userqueue_start; 52 + uint32_t userqueue_end; 51 53 uint32_t gfx_ring0; 52 54 uint32_t sdma_engine[8]; 53 55 uint32_t ih; ··· 113 111 AMDGPU_VEGA20_DOORBELL_MEC_RING5 = 0x008, 114 112 AMDGPU_VEGA20_DOORBELL_MEC_RING6 = 0x009, 115 113 AMDGPU_VEGA20_DOORBELL_MEC_RING7 = 0x00A, 114 + AMDGPU_VEGA20_DOORBELL_USERQUEUE_START = 0x00B, 115 + AMDGPU_VEGA20_DOORBELL_USERQUEUE_END = 0x08A, 116 116 AMDGPU_VEGA20_DOORBELL_GFX_RING0 = 0x08B, 117 117 /* SDMA:256~335*/ 118 118 AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE0 = 0x100, ··· 181 177 AMDGPU_DOORBELL64_MEC_RING5 = 0x08, 182 178 AMDGPU_DOORBELL64_MEC_RING6 = 0x09, 183 179 AMDGPU_DOORBELL64_MEC_RING7 = 0x0a, 180 + 181 + /* User queue doorbell range (128 doorbells) */ 182 + AMDGPU_DOORBELL64_USERQUEUE_START = 0x0b, 183 + AMDGPU_DOORBELL64_USERQUEUE_END = 0x8a, 184 184 185 185 /* Graphics engine */ 186 186 AMDGPU_DOORBELL64_GFX_RING0 = 0x8b,

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

··· 67 67 adev->doorbell_index.mec_ring5 = AMDGPU_DOORBELL64_MEC_RING5; 68 68 adev->doorbell_index.mec_ring6 = AMDGPU_DOORBELL64_MEC_RING6; 69 69 adev->doorbell_index.mec_ring7 = AMDGPU_DOORBELL64_MEC_RING7; 70 + adev->doorbell_index.userqueue_start = AMDGPU_DOORBELL64_USERQUEUE_START; 71 + adev->doorbell_index.userqueue_end = AMDGPU_DOORBELL64_USERQUEUE_END; 70 72 adev->doorbell_index.gfx_ring0 = AMDGPU_DOORBELL64_GFX_RING0; 71 73 adev->doorbell_index.sdma_engine[0] = AMDGPU_DOORBELL64_sDMA_ENGINE0; 72 74 adev->doorbell_index.sdma_engine[1] = AMDGPU_DOORBELL64_sDMA_ENGINE1;

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

··· 65 65 adev->doorbell_index.mec_ring5 = AMDGPU_VEGA20_DOORBELL_MEC_RING5; 66 66 adev->doorbell_index.mec_ring6 = AMDGPU_VEGA20_DOORBELL_MEC_RING6; 67 67 adev->doorbell_index.mec_ring7 = AMDGPU_VEGA20_DOORBELL_MEC_RING7; 68 + adev->doorbell_index.userqueue_start = AMDGPU_VEGA20_DOORBELL_USERQUEUE_START; 69 + adev->doorbell_index.userqueue_end = AMDGPU_VEGA20_DOORBELL_USERQUEUE_END; 68 70 adev->doorbell_index.gfx_ring0 = AMDGPU_VEGA20_DOORBELL_GFX_RING0; 69 71 adev->doorbell_index.sdma_engine[0] = AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE0; 70 72 adev->doorbell_index.sdma_engine[1] = AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE1;