drm/amdgpu/vega10:fix DOORBELL64 scheme

Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Christian König <christian.koenig@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 c571f68358484796309a0ac893df51e3a6d01f3a..ec5d4ae0223ef4620934010a761db603c11c48fe 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -706,15 +706,24 @@ typedef enum _AMDGPU_DOORBELL64_ASSIGNMENT
        AMDGPU_DOORBELL64_IH_RING1                = 0xF5,  /* For page migration request log */
        AMDGPU_DOORBELL64_IH_RING2                = 0xF6,  /* For page migration translation/invalidation log */
 
-       /* VCN engine */
-       AMDGPU_DOORBELL64_VCN0                    = 0xF8,
-       AMDGPU_DOORBELL64_VCN1                    = 0xF9,
-       AMDGPU_DOORBELL64_VCN2                    = 0xFA,
-       AMDGPU_DOORBELL64_VCN3                    = 0xFB,
-       AMDGPU_DOORBELL64_VCN4                    = 0xFC,
-       AMDGPU_DOORBELL64_VCN5                    = 0xFD,
-       AMDGPU_DOORBELL64_VCN6                    = 0xFE,
-       AMDGPU_DOORBELL64_VCN7                    = 0xFF,
+       /* VCN engine use 32 bits doorbell  */
+       AMDGPU_DOORBELL64_VCN0_1                  = 0xF8, /* lower 32 bits for VNC0 and upper 32 bits for VNC1 */
+       AMDGPU_DOORBELL64_VCN2_3                  = 0xF9,
+       AMDGPU_DOORBELL64_VCN4_5                  = 0xFA,
+       AMDGPU_DOORBELL64_VCN6_7                  = 0xFB,
+
+       /* overlap the doorbell assignment with VCN as they are  mutually exclusive
+        * VCE engine's doorbell is 32 bit and two VCE ring share one QWORD
+        */
+       AMDGPU_DOORBELL64_RING0_1                 = 0xF8,
+       AMDGPU_DOORBELL64_RING2_3                 = 0xF9,
+       AMDGPU_DOORBELL64_RING4_5                 = 0xFA,
+       AMDGPU_DOORBELL64_RING6_7                 = 0xFB,
+
+       AMDGPU_DOORBELL64_UVD_RING0_1             = 0xFC,
+       AMDGPU_DOORBELL64_UVD_RING2_3             = 0xFD,
+       AMDGPU_DOORBELL64_UVD_RING4_5             = 0xFE,
+       AMDGPU_DOORBELL64_UVD_RING6_7             = 0xFF,
 
        AMDGPU_DOORBELL64_MAX_ASSIGNMENT          = 0xFF,
        AMDGPU_DOORBELL64_INVALID                 = 0xFFFF