drm/amdgpu: Vega10 doorbell index initialization

v2: Use enum definition instead of hardcoded value
v3: Remove unused enum definition

Signed-off-by: Oak Zeng <ozeng@amd.com>
Suggested-by: Felix Kuehling <Felix.Kuehling@amd.com>
Suggested-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 78406cd45047c6d0350a2a674553e17a615f951e..7e9d9b97183aaaca21bf0034a1d1478160f2b195 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -434,20 +434,14 @@ typedef enum _AMDGPU_DOORBELL64_ASSIGNMENT
         * default non-graphics QWORD index is 0xe0 - 0xFF inclusive
         */
 
-       /* sDMA engines  reserved from 0xe0 -0xef  */
-       AMDGPU_DOORBELL64_sDMA_ENGINE0            = 0xE0,
-       AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0     = 0xE1,
-       AMDGPU_DOORBELL64_sDMA_ENGINE1            = 0xE8,
-       AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE1     = 0xE9,
-
        /* For vega10 sriov, the sdma doorbell must be fixed as follow
         * to keep the same setting with host driver, or it will
         * happen conflicts
         */
-       AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0            = 0xF0,
-       AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE0     = 0xF1,
-       AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE1            = 0xF2,
-       AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE1     = 0xF3,
+       AMDGPU_DOORBELL64_sDMA_ENGINE0            = 0xF0,
+       AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0     = 0xF1,
+       AMDGPU_DOORBELL64_sDMA_ENGINE1            = 0xF2,
+       AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE1     = 0xF3,
 
        /* Interrupt handler */
        AMDGPU_DOORBELL64_IH                      = 0xF4,  /* For legacy interrupt ring buffer */

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index bf5e6a413dee6e9b5de53f62ad7547ecb5e5b23e..bc59f52da0b64bc672ccc32e5b4224fcccb380d3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -606,6 +606,7 @@ static const struct amdgpu_asic_funcs soc15_asic_funcs =
        .flush_hdp = &soc15_flush_hdp,
        .invalidate_hdp = &soc15_invalidate_hdp,
        .need_full_reset = &soc15_need_full_reset,
+       .init_doorbell_index = &vega10_doorbell_index_init,
 };
 
 static int soc15_common_early_init(void *handle)

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.h b/drivers/gpu/drm/amd/amdgpu/soc15.h
index f8ad7804dc406a3b22e8fb30ae30334dba656fbc..d37c57d099762cc6e6ff6f94f059912778e13dde 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc15.h
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.h
@@ -58,4 +58,5 @@ void soc15_program_register_sequence(struct amdgpu_device *adev,
 int vega10_reg_base_init(struct amdgpu_device *adev);
 int vega20_reg_base_init(struct amdgpu_device *adev);
 
+void vega10_doorbell_index_init(struct amdgpu_device *adev);
 #endif

diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c b/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
index c5c9b2bc190d5cdd679e2fd7252d235816cbb166..422674bb3cdfdd8d2864003177b8704280feb0ad 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
+++ b/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
@@ -56,4 +56,32 @@ int vega10_reg_base_init(struct amdgpu_device *adev)
        return 0;
 }
 
+void vega10_doorbell_index_init(struct amdgpu_device *adev)
+{
+       adev->doorbell_index.kiq = AMDGPU_DOORBELL64_KIQ;
+       adev->doorbell_index.mec_ring0 = AMDGPU_DOORBELL64_MEC_RING0;
+       adev->doorbell_index.mec_ring1 = AMDGPU_DOORBELL64_MEC_RING1;
+       adev->doorbell_index.mec_ring2 = AMDGPU_DOORBELL64_MEC_RING2;
+       adev->doorbell_index.mec_ring3 = AMDGPU_DOORBELL64_MEC_RING3;
+       adev->doorbell_index.mec_ring4 = AMDGPU_DOORBELL64_MEC_RING4;
+       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_engine0 = AMDGPU_DOORBELL64_sDMA_ENGINE0;
+       adev->doorbell_index.sdma_engine1 = AMDGPU_DOORBELL64_sDMA_ENGINE1;
+       adev->doorbell_index.ih = AMDGPU_DOORBELL64_IH;
+       adev->doorbell_index.uvd_vce.uvd_ring0_1 = AMDGPU_DOORBELL64_UVD_RING0_1;
+       adev->doorbell_index.uvd_vce.uvd_ring2_3 = AMDGPU_DOORBELL64_UVD_RING2_3;
+       adev->doorbell_index.uvd_vce.uvd_ring4_5 = AMDGPU_DOORBELL64_UVD_RING4_5;
+       adev->doorbell_index.uvd_vce.uvd_ring6_7 = AMDGPU_DOORBELL64_UVD_RING6_7;
+       adev->doorbell_index.uvd_vce.vce_ring0_1 = AMDGPU_DOORBELL64_VCE_RING0_1;
+       adev->doorbell_index.uvd_vce.vce_ring2_3 = AMDGPU_DOORBELL64_VCE_RING2_3;
+       adev->doorbell_index.uvd_vce.vce_ring4_5 = AMDGPU_DOORBELL64_VCE_RING4_5;
+       adev->doorbell_index.uvd_vce.vce_ring6_7 = AMDGPU_DOORBELL64_VCE_RING6_7;
+       /* In unit of dword doorbell */
+       adev->doorbell_index.max_assignment = AMDGPU_DOORBELL64_MAX_ASSIGNMENT << 1;
+}