aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu
diff options
context:
space:
mode:
authorYong Zhao <Yong.Zhao@amd.com>2019-02-01 18:36:21 -0500
committerAlex Deucher <alexander.deucher@amd.com>2019-02-13 17:51:10 -0500
commitc0d9271ecbd891cdeb0fad1edcdd99ee717a655f (patch)
tree109d2f9fdb0ee13ee54d72e3bef3dfd88630cdb7 /drivers/gpu/drm/amd/amdgpu
parent74b9b3ea0cb355d668eb0309d1ab57f403d52c69 (diff)
drm/amdgpu: Delete user queue doorbell variables
They are no longer used, so delete them to avoid confusion. Signed-off-by: Yong Zhao <Yong.Zhao@amd.com> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h8
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c2
3 files changed, 0 insertions, 12 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h
index 1cfec06f81d4..43546500ec26 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h
@@ -48,8 +48,6 @@ struct amdgpu_doorbell_index {
48 uint32_t mec_ring5; 48 uint32_t mec_ring5;
49 uint32_t mec_ring6; 49 uint32_t mec_ring6;
50 uint32_t mec_ring7; 50 uint32_t mec_ring7;
51 uint32_t userqueue_start;
52 uint32_t userqueue_end;
53 uint32_t gfx_ring0; 51 uint32_t gfx_ring0;
54 uint32_t sdma_engine[8]; 52 uint32_t sdma_engine[8];
55 uint32_t ih; 53 uint32_t ih;
@@ -111,8 +109,6 @@ typedef enum _AMDGPU_VEGA20_DOORBELL_ASSIGNMENT
111 AMDGPU_VEGA20_DOORBELL_MEC_RING5 = 0x008, 109 AMDGPU_VEGA20_DOORBELL_MEC_RING5 = 0x008,
112 AMDGPU_VEGA20_DOORBELL_MEC_RING6 = 0x009, 110 AMDGPU_VEGA20_DOORBELL_MEC_RING6 = 0x009,
113 AMDGPU_VEGA20_DOORBELL_MEC_RING7 = 0x00A, 111 AMDGPU_VEGA20_DOORBELL_MEC_RING7 = 0x00A,
114 AMDGPU_VEGA20_DOORBELL_USERQUEUE_START = 0x00B,
115 AMDGPU_VEGA20_DOORBELL_USERQUEUE_END = 0x08A,
116 AMDGPU_VEGA20_DOORBELL_GFX_RING0 = 0x08B, 112 AMDGPU_VEGA20_DOORBELL_GFX_RING0 = 0x08B,
117 /* SDMA:256~335*/ 113 /* SDMA:256~335*/
118 AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE0 = 0x100, 114 AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE0 = 0x100,
@@ -176,10 +172,6 @@ typedef enum _AMDGPU_DOORBELL64_ASSIGNMENT
176 AMDGPU_DOORBELL64_MEC_RING6 = 0x09, 172 AMDGPU_DOORBELL64_MEC_RING6 = 0x09,
177 AMDGPU_DOORBELL64_MEC_RING7 = 0x0a, 173 AMDGPU_DOORBELL64_MEC_RING7 = 0x0a,
178 174
179 /* User queue doorbell range (128 doorbells) */
180 AMDGPU_DOORBELL64_USERQUEUE_START = 0x0b,
181 AMDGPU_DOORBELL64_USERQUEUE_END = 0x8a,
182
183 /* Graphics engine */ 175 /* Graphics engine */
184 AMDGPU_DOORBELL64_GFX_RING0 = 0x8b, 176 AMDGPU_DOORBELL64_GFX_RING0 = 0x8b,
185 177
diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c b/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
index 4b5d60ea3e78..62f49c895314 100644
--- a/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
+++ b/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
@@ -67,8 +67,6 @@ void vega10_doorbell_index_init(struct amdgpu_device *adev)
67 adev->doorbell_index.mec_ring5 = AMDGPU_DOORBELL64_MEC_RING5; 67 adev->doorbell_index.mec_ring5 = AMDGPU_DOORBELL64_MEC_RING5;
68 adev->doorbell_index.mec_ring6 = AMDGPU_DOORBELL64_MEC_RING6; 68 adev->doorbell_index.mec_ring6 = AMDGPU_DOORBELL64_MEC_RING6;
69 adev->doorbell_index.mec_ring7 = AMDGPU_DOORBELL64_MEC_RING7; 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;
72 adev->doorbell_index.gfx_ring0 = AMDGPU_DOORBELL64_GFX_RING0; 70 adev->doorbell_index.gfx_ring0 = AMDGPU_DOORBELL64_GFX_RING0;
73 adev->doorbell_index.sdma_engine[0] = AMDGPU_DOORBELL64_sDMA_ENGINE0; 71 adev->doorbell_index.sdma_engine[0] = AMDGPU_DOORBELL64_sDMA_ENGINE0;
74 adev->doorbell_index.sdma_engine[1] = AMDGPU_DOORBELL64_sDMA_ENGINE1; 72 adev->doorbell_index.sdma_engine[1] = AMDGPU_DOORBELL64_sDMA_ENGINE1;
diff --git a/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c b/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c
index 53716c593b2b..1271e1702ad4 100644
--- a/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c
+++ b/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c
@@ -65,8 +65,6 @@ void vega20_doorbell_index_init(struct amdgpu_device *adev)
65 adev->doorbell_index.mec_ring5 = AMDGPU_VEGA20_DOORBELL_MEC_RING5; 65 adev->doorbell_index.mec_ring5 = AMDGPU_VEGA20_DOORBELL_MEC_RING5;
66 adev->doorbell_index.mec_ring6 = AMDGPU_VEGA20_DOORBELL_MEC_RING6; 66 adev->doorbell_index.mec_ring6 = AMDGPU_VEGA20_DOORBELL_MEC_RING6;
67 adev->doorbell_index.mec_ring7 = AMDGPU_VEGA20_DOORBELL_MEC_RING7; 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;
70 adev->doorbell_index.gfx_ring0 = AMDGPU_VEGA20_DOORBELL_GFX_RING0; 68 adev->doorbell_index.gfx_ring0 = AMDGPU_VEGA20_DOORBELL_GFX_RING0;
71 adev->doorbell_index.sdma_engine[0] = AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE0; 69 adev->doorbell_index.sdma_engine[0] = AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE0;
72 adev->doorbell_index.sdma_engine[1] = AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE1; 70 adev->doorbell_index.sdma_engine[1] = AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE1;