Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0d9271e authored by Yong Zhao's avatar Yong Zhao Committed by Alex Deucher
Browse files

drm/amdgpu: Delete user queue doorbell variables 



They are no longer used, so delete them to avoid confusion.

Signed-off-by: default avatarYong Zhao <Yong.Zhao@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 74b9b3ea

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

+0 −8
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ struct amdgpu_doorbell_index { 
	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_engine[8];

	uint32_t ih;
@@ -111,8 +109,6 @@ typedef enum _AMDGPU_VEGA20_DOORBELL_ASSIGNMENT 
	AMDGPU_VEGA20_DOORBELL_MEC_RING5               = 0x008,

	AMDGPU_VEGA20_DOORBELL_MEC_RING6               = 0x009,

	AMDGPU_VEGA20_DOORBELL_MEC_RING7               = 0x00A,

	AMDGPU_VEGA20_DOORBELL_USERQUEUE_START	       = 0x00B,

	AMDGPU_VEGA20_DOORBELL_USERQUEUE_END	       = 0x08A,

	AMDGPU_VEGA20_DOORBELL_GFX_RING0               = 0x08B,

	/* SDMA:256~335*/

	AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE0            = 0x100,
@@ -176,10 +172,6 @@ typedef enum _AMDGPU_DOORBELL64_ASSIGNMENT 
	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,

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

+0 −2
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ void vega10_doorbell_index_init(struct amdgpu_device *adev) 
	adev->doorbell_index.mec_ring5 = AMDGPU_DOORBELL64_MEC_RING5;

	adev->doorbell_index.mec_ring6 = AMDGPU_DOORBELL64_MEC_RING6;

	adev->doorbell_index.mec_ring7 = AMDGPU_DOORBELL64_MEC_RING7;

	adev->doorbell_index.userqueue_start = AMDGPU_DOORBELL64_USERQUEUE_START;

	adev->doorbell_index.userqueue_end = AMDGPU_DOORBELL64_USERQUEUE_END;

	adev->doorbell_index.gfx_ring0 = AMDGPU_DOORBELL64_GFX_RING0;

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

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

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

+0 −2
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ void vega20_doorbell_index_init(struct amdgpu_device *adev) 
	adev->doorbell_index.mec_ring5 = AMDGPU_VEGA20_DOORBELL_MEC_RING5;

	adev->doorbell_index.mec_ring6 = AMDGPU_VEGA20_DOORBELL_MEC_RING6;

	adev->doorbell_index.mec_ring7 = AMDGPU_VEGA20_DOORBELL_MEC_RING7;

	adev->doorbell_index.userqueue_start = AMDGPU_VEGA20_DOORBELL_USERQUEUE_START;

	adev->doorbell_index.userqueue_end = AMDGPU_VEGA20_DOORBELL_USERQUEUE_END;

	adev->doorbell_index.gfx_ring0 = AMDGPU_VEGA20_DOORBELL_GFX_RING0;

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

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