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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h
index 1cfec06..4354650 100644 (file)
--- 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 {
        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,
 

diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c b/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
index 4b5d60e..62f49c8 100644 (file)
--- 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)
        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;

diff --git a/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c b/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c
index 53716c5..1271e17 100644 (file)
--- 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)
        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;