drm/amdgpu: According hardware design revert vce and uvd doorbell assignment
Subsystems (2)
PATCH 5/8 drm/amdgpu: According hardware design revert vce and uvd doorbell assignment
From: Frank Min <[email protected]>
Now uvd doorbell is from 0xf8-0xfb and vce doorbell is from 0xfc-0xff
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 18 +++++++++--------- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 6 ++++-- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 6 +++--- 3 files changed, 16 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +9 -9
@@ -680,15 +680,15 @@ typedef enum _AMDGPU_DOORBELL64_ASSIGNMENT/* 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_UVD_RING0_1 =0xF8 , +AMDGPU_DOORBELL64_UVD_RING2_3 =0xF9 , +AMDGPU_DOORBELL64_UVD_RING4_5 =0xFA , +AMDGPU_DOORBELL64_UVD_RING6_7 =0xFB , + +AMDGPU_DOORBELL64_VCE_RING0_1 =0xFC , +AMDGPU_DOORBELL64_VCE_RING2_3 =0xFD , +AMDGPU_DOORBELL64_VCE_RING4_5 =0xFE , +AMDGPU_DOORBELL64_VCE_RING6_7 =0xFF ,AMDGPU_DOORBELL64_MAX_ASSIGNMENT =0xFF ,AMDGPU_DOORBELL64_INVALID =0xFFFF
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +4 -2
@@ -435,13 +435,15 @@ static int uvd_v7_0_sw_init(void *handle)return r; } -for (i =0 ; i < adev->uvd.num_enc_rings; ++i) { ring = &adev->uvd.ring_enc[i];sprintf (ring->name,"uvd_enc%d" , i);if (amdgpu_sriov_vf (adev)) { ring->use_doorbell = true; - ring->doorbell_index =AMDGPU_DOORBELL64_UVD_RING0_1 *2 ; +if (i ==0 ) + ring->doorbell_index =AMDGPU_DOORBELL64_UVD_RING0_1 *2 ; +else + ring->doorbell_index =AMDGPU_DOORBELL64_UVD_RING2_3 *2 +1 ; } r =amdgpu_ring_init (adev, ring,512 , &adev->uvd.irq,0 );if (r)
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +3 -3
@@ -446,11 +446,11 @@ static int vce_v4_0_sw_init(void *handle)/* DOORBELL only works under SRIOV */ ring->use_doorbell = true;if (i ==0 ) - ring->doorbell_index =AMDGPU_DOORBELL64_RING0_1 *2 ; + ring->doorbell_index =AMDGPU_DOORBELL64_VCE_RING0_1 *2 ;else if (i ==1 ) - ring->doorbell_index =AMDGPU_DOORBELL64_RING2_3 *2 ; + ring->doorbell_index =AMDGPU_DOORBELL64_VCE_RING2_3 *2 ;else - ring->doorbell_index =AMDGPU_DOORBELL64_RING2_3 *2 +1 ; + ring->doorbell_index =AMDGPU_DOORBELL64_VCE_RING2_3 *2 +1 ; } r =amdgpu_ring_init (adev, ring,512 , &adev->vce.irq,0 );if (r)
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1500974252-2576-1-git-send-email-Xiangliang.Yu-5C7GfCeVMHo@public.gmane.org
Quoted 50 lines · Xiangliang.Yu
From: Frank Min <[email protected]>
Now uvd doorbell is from 0xf8-0xfb and vce doorbell is from 0xfc-0xff
Signed-off-by Frank Min <[email protected]>Signed-off-by Xiangliang.Yu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 18 +++++++++--------- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 6 ++++-- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 6 +++--- 3 files changed, 16 insertions(+), 14 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +9
-9@@ -680,15 +680,15 @@ typedef enum _AMDGPU_DOORBELL64_ASSIGNMENT/* 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_UVD_RING0_1 =0xF8 , +AMDGPU_DOORBELL64_UVD_RING2_3 =0xF9 , +AMDGPU_DOORBELL64_UVD_RING4_5 =0xFA , +AMDGPU_DOORBELL64_UVD_RING6_7 =0xFB , + +AMDGPU_DOORBELL64_VCE_RING0_1 =0xFC , +AMDGPU_DOORBELL64_VCE_RING2_3 =0xFD , +AMDGPU_DOORBELL64_VCE_RING4_5 =0xFE , +AMDGPU_DOORBELL64_VCE_RING6_7 =0xFF ,AMDGPU_DOORBELL64_MAX_ASSIGNMENT =0xFF ,AMDGPU_DOORBELL64_INVALID =0xFFFF drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +0
-1@@ -435,13 +435,15 @@ static int uvd_v7_0_sw_init(void *handle)return r; } -
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c static int uvd_v7_0_sw_init(void *handle) · line 446
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +4
-1for (i =0 ; i < adev->uvd.num_enc_rings; ++i) { ring = &adev->uvd.ring_enc[i];sprintf (ring->name,"uvd_enc%d" , i);if (amdgpu_sriov_vf (adev)) { ring->use_doorbell = true; - ring->doorbell_index =AMDGPU_DOORBELL64_UVD_RING0_1 *2 ; +if (i ==0 ) + ring->doorbell_index =AMDGPU_DOORBELL64_UVD_RING0_1 *2 ; +else + ring->doorbell_index =AMDGPU_DOORBELL64_UVD_RING2_3 *2 +1 ;
Can you clarify the requirements? This logic doesn't seem right.
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +0
-0} r =amdgpu_ring_init (adev, ring,512 , &adev->uvd.irq,0 );if (r)drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +0
-0@@ -446,11 +446,11 @@ static int vce_v4_0_sw_init(void *handle)/* DOORBELL only works under SRIOV */
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c static int vce_v4_0_sw_init(void *handle) · line 453
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +3
-3ring->use_doorbell = true;if (i ==0 ) - ring->doorbell_index =AMDGPU_DOORBELL64_RING0_1 *2 ; + ring->doorbell_index =AMDGPU_DOORBELL64_VCE_RING0_1 *2 ;else if (i ==1 ) - ring->doorbell_index =AMDGPU_DOORBELL64_RING2_3 *2 ; + ring->doorbell_index =AMDGPU_DOORBELL64_VCE_RING2_3 *2 ;else - ring->doorbell_index =AMDGPU_DOORBELL64_RING2_3 *2 +1 ; + ring->doorbell_index =AMDGPU_DOORBELL64_VCE_RING2_3 *2 +1 ;
Same here. The one is even weirder.
Alex
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +0
-1} r =amdgpu_ring_init (adev, ring,512 , &adev->vce.irq,0 );if (r) --2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx