drm/amdgpu: add doorbell index for VPE

Add doorbell index for Video Processing Engine.

Signed-off-by: Lang Yu <Lang.Yu@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 09f6727e7c73ae3cd441999a6e883ef515a4d148..b0edeedbc14f0a5b08e5c6f23bbc3ceb434f4035 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h
@@ -86,6 +86,7 @@ struct amdgpu_doorbell_index {
                        uint32_t vce_ring6_7;
                } uvd_vce;
        };
+       uint32_t vpe_ring;
        uint32_t first_non_cp;
        uint32_t last_non_cp;
        uint32_t max_assignment;
@@ -226,10 +227,12 @@ enum AMDGPU_NAVI10_DOORBELL_ASSIGNMENT {
        AMDGPU_NAVI10_DOORBELL64_VCNc_d                 = 0x18E,
        AMDGPU_NAVI10_DOORBELL64_VCNe_f                 = 0x18F,
 
+       AMDGPU_NAVI10_DOORBELL64_VPE                    = 0x190,
+
        AMDGPU_NAVI10_DOORBELL64_FIRST_NON_CP           = AMDGPU_NAVI10_DOORBELL_sDMA_ENGINE0,
-       AMDGPU_NAVI10_DOORBELL64_LAST_NON_CP            = AMDGPU_NAVI10_DOORBELL64_VCNe_f,
+       AMDGPU_NAVI10_DOORBELL64_LAST_NON_CP            = AMDGPU_NAVI10_DOORBELL64_VPE,
 
-       AMDGPU_NAVI10_DOORBELL_MAX_ASSIGNMENT           = 0x18F,
+       AMDGPU_NAVI10_DOORBELL_MAX_ASSIGNMENT           = AMDGPU_NAVI10_DOORBELL64_VPE,
        AMDGPU_NAVI10_DOORBELL_INVALID                  = 0xFFFF
 };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c
index a920bcb9f5b32d6191f27e37f3b0500f2ffb2593..cad57afa89e4a2bb4cfe65d3843ee5cec1a9c5a4 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc21.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc21.c
@@ -503,6 +503,7 @@ static void soc21_init_doorbell_index(struct amdgpu_device *adev)
        adev->doorbell_index.vcn.vcn_ring2_3 = AMDGPU_NAVI10_DOORBELL64_VCN2_3;
        adev->doorbell_index.vcn.vcn_ring4_5 = AMDGPU_NAVI10_DOORBELL64_VCN4_5;
        adev->doorbell_index.vcn.vcn_ring6_7 = AMDGPU_NAVI10_DOORBELL64_VCN6_7;
+       adev->doorbell_index.vpe_ring = AMDGPU_NAVI10_DOORBELL64_VPE;
        adev->doorbell_index.first_non_cp = AMDGPU_NAVI10_DOORBELL64_FIRST_NON_CP;
        adev->doorbell_index.last_non_cp = AMDGPU_NAVI10_DOORBELL64_LAST_NON_CP;