drm/amdgpu: track the number of vce rings
Subsystems (2)
PATCH 1/2 drm/amdgpu: track the number of vce rings
Rather than using a hardcoded value. This allows
different versions to expose more or less rings.
No functional change.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 57 +++++++++++++++------------------ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 37 +++++++++++---------- 4 files changed, 45 insertions(+), 52 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1686,6 +1686,7 @@ struct amdgpu_vce {unsigned harvest_config;struct amd_sched_entity entity;uint32_t srbm_soft_reset; +unsigned num_rings; };/*
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1 -1
@@ -296,7 +296,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_filebreak ;case AMDGPU_HW_IP_VCE : type =AMD_IP_BLOCK_TYPE_VCE ; -for (i =0 ; i <AMDGPU_MAX_VCE_RINGS ; i++) +for (i =0 ; i < adev->vce.num_rings; i++) ring_mask |= ((adev->vce.ring[i].ready ?1 :0 ) << i); ib_start_alignment =AMDGPU_GPU_PAGE_SIZE ; ib_size_alignment =1 ;
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +25 -32
94 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +18 -19
@@ -345,6 +345,8 @@ static int vce_v3_0_early_init(void *handle) (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))return -ENOENT ; + adev->vce.num_rings =2 ; +vce_v3_0_set_ring_funcs (adev);vce_v3_0_set_irq_funcs (adev);
@@ -355,7 +357,7 @@ static int vce_v3_0_sw_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;struct amdgpu_ring *ring; -int r; +int r, i;/* VCE */ r =amdgpu_irq_add_id (adev,167 , &adev->vce.irq);
@@ -371,19 +373,14 @@ static int vce_v3_0_sw_init(void *handle)if (r)return r; - ring = &adev->vce.ring[0 ]; -sprintf (ring->name,"vce0" ); - r =amdgpu_ring_init (adev, ring,512 ,VCE_CMD_NO_OP ,0xf , - &adev->vce.irq,0 ,AMDGPU_RING_TYPE_VCE ); -if (r) -return r; - - ring = &adev->vce.ring[1 ]; -sprintf (ring->name,"vce1" ); - r =amdgpu_ring_init (adev, ring,512 ,VCE_CMD_NO_OP ,0xf , - &adev->vce.irq,0 ,AMDGPU_RING_TYPE_VCE ); -if (r) -return r; +for (i =0 ; i < adev->vce.num_rings; i++) { + ring = &adev->vce.ring[i]; +sprintf (ring->name,"vce%d" , i); + r =amdgpu_ring_init (adev, ring,512 ,VCE_CMD_NO_OP ,0xf , + &adev->vce.irq,0 ,AMDGPU_RING_TYPE_VCE ); +if (r) +return r; + }return r; }
@@ -413,10 +410,10 @@ static int vce_v3_0_hw_init(void *handle)if (r)return r; - adev->vce.ring[0 ].ready = false; - adev->vce.ring[1 ].ready = false; +for (i =0 ; i < adev->vce.num_rings; i++) + adev->vce.ring[i].ready = false; -for (i =0 ; i <2 ; i++) { +for (i =0 ; i < adev->vce.num_rings; i++) { r =amdgpu_ring_test_ring (&adev->vce.ring[i]);if (r)return r;
@@ -800,8 +797,10 @@ static const struct amdgpu_ring_funcs vce_v3_0_ring_funcs = {static void vce_v3_0_set_ring_funcs (struct amdgpu_device *adev) { - adev->vce.ring[0 ].funcs = &vce_v3_0_ring_funcs; - adev->vce.ring[1 ].funcs = &vce_v3_0_ring_funcs; +int i; + +for (i =0 ; i < adev->vce.num_rings; i++) + adev->vce.ring[i].funcs = &vce_v3_0_ring_funcs; }static const struct amdgpu_irq_src_funcs vce_v3_0_irq_funcs = {
Signature · 6 lines
2.5.5 _______________________________________________ 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): 1472077894-1578-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amdgpu/vce3: add support for third vce ring
Not of much use at the moment (we don't really use the second ring either), but may be useful later.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 22 ++++++++++++++++++---- 3 files changed, 21 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -1
@@ -108,7 +108,7 @@ extern char *amdgpu_virtual_display;#define AMDGPU_MAX_RINGS 16#define AMDGPU_MAX_GFX_RINGS 1#define AMDGPU_MAX_COMPUTE_RINGS 8 -#define AMDGPU_MAX_VCE_RINGS 2 +#define AMDGPU_MAX_VCE_RINGS 3/* max number of IP instances */ #define AMDGPU_MAX_SDMA_INSTANCES 2
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +2 -2
@@ -850,8 +850,8 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)struct fence *fence =NULL ;long r; -/* skip vce ring1 ib test for now, since it's not reliable */ -if (ring == &ring->adev->vce.ring[1 ]) +/* skip vce ring1/2 ib test for now, since it's not reliable */ +if (ring != &ring->adev->vce.ring[0 ])return 0 ; r =amdgpu_vce_get_create_msg (ring,1 ,NULL );
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +18 -4
@@ -70,8 +70,10 @@ static uint32_t vce_v3_0_ring_get_rptr(struct amdgpu_ring *ring)if (ring == &adev->vce.ring[0 ])return RREG32 (mmVCE_RB_RPTR); -else +else if (ring == &adev->vce.ring[1 ])return RREG32 (mmVCE_RB_RPTR2); +else +return RREG32 (mmVCE_RB_RPTR3); }/**
@@ -87,8 +89,10 @@ static uint32_t vce_v3_0_ring_get_wptr(struct amdgpu_ring *ring)if (ring == &adev->vce.ring[0 ])return RREG32 (mmVCE_RB_WPTR); -else +else if (ring == &adev->vce.ring[1 ])return RREG32 (mmVCE_RB_WPTR2); +else +return RREG32 (mmVCE_RB_WPTR3); }/**
@@ -104,8 +108,10 @@ static void vce_v3_0_ring_set_wptr(struct amdgpu_ring *ring)if (ring == &adev->vce.ring[0 ])WREG32 (mmVCE_RB_WPTR, ring->wptr); -else +else if (ring == &adev->vce.ring[1 ])WREG32 (mmVCE_RB_WPTR2, ring->wptr); +else +WREG32 (mmVCE_RB_WPTR3, ring->wptr); }static void vce_v3_0_override_vce_clock_gating (struct amdgpu_device *adev,bool override)
@@ -229,6 +235,13 @@ static int vce_v3_0_start(struct amdgpu_device *adev)WREG32 (mmVCE_RB_BASE_HI2,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE2, ring->ring_size /4 ); + ring = &adev->vce.ring[2 ]; +WREG32 (mmVCE_RB_RPTR3, ring->wptr); +WREG32 (mmVCE_RB_WPTR3, ring->wptr); +WREG32 (mmVCE_RB_BASE_LO3, ring->gpu_addr); +WREG32 (mmVCE_RB_BASE_HI3,upper_32_bits (ring->gpu_addr)); +WREG32 (mmVCE_RB_SIZE3, ring->ring_size /4 ); +mutex_lock (&adev->grbm_idx_mutex);for (idx =0 ; idx <2 ; ++idx) {if (adev->vce.harvest_config & (1 << idx))
@@ -345,7 +358,7 @@ static int vce_v3_0_early_init(void *handle) (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))return -ENOENT ; - adev->vce.num_rings =2 ; + adev->vce.num_rings =3 ;vce_v3_0_set_ring_funcs (adev);vce_v3_0_set_irq_funcs (adev);
@@ -671,6 +684,7 @@ static int vce_v3_0_process_interrupt(struct amdgpu_device *adev,switch (entry->src_data) {case 0 :case 1 : +case 2 :amdgpu_fence_process (&adev->vce.ring[entry->src_data]);break ;default :
Signature · 6 lines
2.5.5 _______________________________________________ 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): 1472077894-1578-2-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
答复: [PATCH 2/2] drm/amdgpu/vce3: add support for third vce ring
These series Reivewed-by: JimQu <[email protected]>
Thanks
JimQu
________________________________________
发件人: amd-gfx <[email protected]> 代表 Alex Deucher <[email protected]> 发送时间: 2016年8月25日 6:31:34
收件人: [email protected]
抄送: Deucher, Alexander
主题: [PATCH 2/2] drm/amdgpu/vce3: add support for third vce ring
Not of much use at the moment (we don't really use the second ring either), but may be useful later.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 22 ++++++++++++++++++---- 3 files changed, 21 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -1
@@ -108,7 +108,7 @@ extern char *amdgpu_virtual_display;#define AMDGPU_MAX_RINGS 16#define AMDGPU_MAX_GFX_RINGS 1#define AMDGPU_MAX_COMPUTE_RINGS 8 -#define AMDGPU_MAX_VCE_RINGS 2 +#define AMDGPU_MAX_VCE_RINGS 3/* max number of IP instances */ #define AMDGPU_MAX_SDMA_INSTANCES 2
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +2 -2
@@ -850,8 +850,8 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)struct fence *fence =NULL ;long r; -/* skip vce ring1 ib test for now, since it's not reliable */ -if (ring == &ring->adev->vce.ring[1 ]) +/* skip vce ring1/2 ib test for now, since it's not reliable */ +if (ring != &ring->adev->vce.ring[0 ])return 0 ; r =amdgpu_vce_get_create_msg (ring,1 ,NULL );
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +18 -4
@@ -70,8 +70,10 @@ static uint32_t vce_v3_0_ring_get_rptr(struct amdgpu_ring *ring)if (ring == &adev->vce.ring[0 ])return RREG32 (mmVCE_RB_RPTR); -else +else if (ring == &adev->vce.ring[1 ])return RREG32 (mmVCE_RB_RPTR2); +else +return RREG32 (mmVCE_RB_RPTR3); }/**
@@ -87,8 +89,10 @@ static uint32_t vce_v3_0_ring_get_wptr(struct amdgpu_ring *ring)if (ring == &adev->vce.ring[0 ])return RREG32 (mmVCE_RB_WPTR); -else +else if (ring == &adev->vce.ring[1 ])return RREG32 (mmVCE_RB_WPTR2); +else +return RREG32 (mmVCE_RB_WPTR3); }/**
@@ -104,8 +108,10 @@ static void vce_v3_0_ring_set_wptr(struct amdgpu_ring *ring)if (ring == &adev->vce.ring[0 ])WREG32 (mmVCE_RB_WPTR, ring->wptr); -else +else if (ring == &adev->vce.ring[1 ])WREG32 (mmVCE_RB_WPTR2, ring->wptr); +else +WREG32 (mmVCE_RB_WPTR3, ring->wptr); }static void vce_v3_0_override_vce_clock_gating (struct amdgpu_device *adev,bool override)
@@ -229,6 +235,13 @@ static int vce_v3_0_start(struct amdgpu_device *adev)WREG32 (mmVCE_RB_BASE_HI2,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE2, ring->ring_size /4 ); + ring = &adev->vce.ring[2 ]; +WREG32 (mmVCE_RB_RPTR3, ring->wptr); +WREG32 (mmVCE_RB_WPTR3, ring->wptr); +WREG32 (mmVCE_RB_BASE_LO3, ring->gpu_addr); +WREG32 (mmVCE_RB_BASE_HI3,upper_32_bits (ring->gpu_addr)); +WREG32 (mmVCE_RB_SIZE3, ring->ring_size /4 ); +mutex_lock (&adev->grbm_idx_mutex);for (idx =0 ; idx <2 ; ++idx) {if (adev->vce.harvest_config & (1 << idx))
@@ -345,7 +358,7 @@ static int vce_v3_0_early_init(void *handle) (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))return -ENOENT ; - adev->vce.num_rings =2 ; + adev->vce.num_rings =3 ;vce_v3_0_set_ring_funcs (adev);vce_v3_0_set_irq_funcs (adev);
@@ -671,6 +684,7 @@ static int vce_v3_0_process_interrupt(struct amdgpu_device *adev,switch (entry->src_data) {case 0 :case 1 : +case 2 :amdgpu_fence_process (&adev->vce.ring[entry->src_data]);break ;default :
--
2.5.5
_______________________________________________
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
A message that is not in the archive (sent off-list or not yet received): BY2PR12MB061416519B91E245BB5835A299ED0-K//h7OWB4q5SmL+xRiD5tgdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Christian König
Reviewed-byRe: 答复: [PATCH 2/2] drm/amdgpu/vce3: add support for third vce ring
Do we have any requirement to support ring 2 and 3 in the near future or was this set just for cleanup?
Regards,
Christian.
Am 25.08.2016 um 02:03 schrieb Qu, Jim:
Quoted 124 lines
These series Reivewed-by: JimQu <[email protected]>
Thanks
JimQu________________________________________
发件人: amd-gfx <[email protected]> 代表 Alex Deucher <[email protected]> 发送时间: 2016年8月25日 6:31:34
收件人: [email protected]
抄送: Deucher, Alexander
主题: [PATCH 2/2] drm/amdgpu/vce3: add support for third vce ringNot of much use at the moment (we don't really use the second ring either), but may be useful later.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 22 ++++++++++++++++++---- 3 files changed, 21 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-1@@ -108,7 +108,7 @@ extern char *amdgpu_virtual_display;#define AMDGPU_MAX_RINGS 16#define AMDGPU_MAX_GFX_RINGS 1#define AMDGPU_MAX_COMPUTE_RINGS 8 -#define AMDGPU_MAX_VCE_RINGS 2 +#define AMDGPU_MAX_VCE_RINGS 3/* max number of IP instances */ #define AMDGPU_MAX_SDMA_INSTANCES 2drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +2
-2@@ -850,8 +850,8 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)struct fence *fence =NULL ;long r; -/* skip vce ring1 ib test for now, since it's not reliable */ -if (ring == &ring->adev->vce.ring[1 ]) +/* skip vce ring1/2 ib test for now, since it's not reliable */ +if (ring != &ring->adev->vce.ring[0 ])return 0 ; r =amdgpu_vce_get_create_msg (ring,1 ,NULL );drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +18
-5@@ -70,8 +70,10 @@ static uint32_t vce_v3_0_ring_get_rptr(struct amdgpu_ring *ring)if (ring == &adev->vce.ring[0 ])return RREG32 (mmVCE_RB_RPTR); -else +else if (ring == &adev->vce.ring[1 ])return RREG32 (mmVCE_RB_RPTR2); +else +return RREG32 (mmVCE_RB_RPTR3); }/** @@ -87,8 +89,10 @@ static uint32_t vce_v3_0_ring_get_wptr(struct amdgpu_ring *ring)if (ring == &adev->vce.ring[0 ])return RREG32 (mmVCE_RB_WPTR); -else +else if (ring == &adev->vce.ring[1 ])return RREG32 (mmVCE_RB_WPTR2); +else +return RREG32 (mmVCE_RB_WPTR3); }/** @@ -104,8 +108,10 @@ static void vce_v3_0_ring_set_wptr(struct amdgpu_ring *ring)if (ring == &adev->vce.ring[0 ])WREG32 (mmVCE_RB_WPTR, ring->wptr); -else +else if (ring == &adev->vce.ring[1 ])WREG32 (mmVCE_RB_WPTR2, ring->wptr); +else +WREG32 (mmVCE_RB_WPTR3, ring->wptr); }static void vce_v3_0_override_vce_clock_gating (struct amdgpu_device *adev,bool override)@@ -229,6 +235,13 @@ static int vce_v3_0_start(struct amdgpu_device *adev)WREG32 (mmVCE_RB_BASE_HI2,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE2, ring->ring_size /4 ); + ring = &adev->vce.ring[2 ]; +WREG32 (mmVCE_RB_RPTR3, ring->wptr); +WREG32 (mmVCE_RB_WPTR3, ring->wptr); +WREG32 (mmVCE_RB_BASE_LO3, ring->gpu_addr); +WREG32 (mmVCE_RB_BASE_HI3,upper_32_bits (ring->gpu_addr)); +WREG32 (mmVCE_RB_SIZE3, ring->ring_size /4 ); +mutex_lock (&adev->grbm_idx_mutex);for (idx =0 ; idx <2 ; ++idx) {if (adev->vce.harvest_config & (1 << idx))@@ -345,7 +358,7 @@ static int vce_v3_0_early_init(void *handle) (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))return -ENOENT ; - adev->vce.num_rings =2 ; + adev->vce.num_rings =3 ;vce_v3_0_set_ring_funcs (adev);vce_v3_0_set_irq_funcs (adev);@@ -671,6 +684,7 @@ static int vce_v3_0_process_interrupt(struct amdgpu_device *adev,switch (entry->src_data) {case 0 :case 1 : +case 2 :amdgpu_fence_process (&adev->vce.ring[entry->src_data]);break ;default : --2.5.5
Quoted 8 lines
_______________________________________________
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
_______________________________________________
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): d9757016-eda3-ad34-d4f9-0e5e2d029897-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Re: 答复: [PATCH 2/2] drm/amdgpu/vce3: add support for third vce ring
Quoted 4 lines · Christian König
Reviewed-by Christian König <[email protected]> as well.Do we have any requirement to support ring 2 and 3 in the near future or was this set just for cleanup?
Just cleanup and I was wondering if perhaps setting up all the rings might make the engine happier for things like suspend and resume.
Alex
Quoted 141 lines
Regards,
Christian.Am 25.08.2016 um 02:03 schrieb Qu, Jim:
Quoted 135 lines
These series Reivewed-by: JimQu <[email protected]>
Thanks
JimQu________________________________________
发件人: amd-gfx <[email protected]> 代表 Alex Deucher <[email protected]>
发送时间: 2016年8月25日 6:31:34
收件人: [email protected]
抄送: Deucher, Alexander
主题: [PATCH 2/2] drm/amdgpu/vce3: add support for third vce ringNot of much use at the moment (we don't really use the second ring either), but may be useful later.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 22 ++++++++++++++++++---- 3 files changed, 21 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-1@@ -108,7 +108,7 @@ extern char *amdgpu_virtual_display;#define AMDGPU_MAX_RINGS 16#define AMDGPU_MAX_GFX_RINGS 1#define AMDGPU_MAX_COMPUTE_RINGS 8 -#define AMDGPU_MAX_VCE_RINGS 2 +#define AMDGPU_MAX_VCE_RINGS 3/* max number of IP instances */ #define AMDGPU_MAX_SDMA_INSTANCES 2drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +2
-2@@ -850,8 +850,8 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)struct fence *fence =NULL ;long r; -/* skip vce ring1 ib test for now, since it's not reliable */ -if (ring == &ring->adev->vce.ring[1 ]) +/* skip vce ring1/2 ib test for now, since it's not reliable */ +if (ring != &ring->adev->vce.ring[0 ])return 0 ;r = amdgpu_vce_get_create_msg(ring, 1, NULL);drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +3
-1@@ -70,8 +70,10 @@ static uint32_t vce_v3_0_ring_get_rptr(struct amdgpu_ring *ring)if (ring == &adev->vce.ring[0 ])return RREG32 (mmVCE_RB_RPTR); -else +else if (ring == &adev->vce.ring[1 ])return RREG32 (mmVCE_RB_RPTR2); +else +return RREG32 (mmVCE_RB_RPTR3); }/**
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +3
-1@@ -87,8 +89,10 @@ static uint32_t vce_v3_0_ring_get_wptr(struct amdgpu_ring *ring)if (ring == &adev->vce.ring[0 ])return RREG32 (mmVCE_RB_WPTR); -else +else if (ring == &adev->vce.ring[1 ])return RREG32 (mmVCE_RB_WPTR2); +else +return RREG32 (mmVCE_RB_WPTR3); }/**
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +3
-1@@ -104,8 +108,10 @@ static void vce_v3_0_ring_set_wptr(struct amdgpu_ring *ring)if (ring == &adev->vce.ring[0 ])WREG32 (mmVCE_RB_WPTR, ring->wptr); -else +else if (ring == &adev->vce.ring[1 ])WREG32 (mmVCE_RB_WPTR2, ring->wptr); +else +WREG32 (mmVCE_RB_WPTR3, ring->wptr); }static void vce_v3_0_override_vce_clock_gating(struct
amdgpu_device
*adev, bool override)drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +9
-1@@ -229,6 +235,13 @@ static int vce_v3_0_start(struct amdgpu_device *adev)WREG32 (mmVCE_RB_BASE_HI2,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE2, ring->ring_size /4 ); + ring = &adev->vce.ring[2 ]; +WREG32 (mmVCE_RB_RPTR3, ring->wptr); +WREG32 (mmVCE_RB_WPTR3, ring->wptr); +WREG32 (mmVCE_RB_BASE_LO3, ring->gpu_addr); +WREG32 (mmVCE_RB_BASE_HI3,upper_32_bits (ring->gpu_addr)); +WREG32 (mmVCE_RB_SIZE3, ring->ring_size /4 ); +mutex_lock (&adev->grbm_idx_mutex);for (idx =0 ; idx <2 ; ++idx) {if (adev->vce.harvest_config & (1 << idx))@@ -345,7 +358,7 @@ static int vce_v3_0_early_init(void *handle) (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))return -ENOENT ; - adev->vce.num_rings =2 ; + adev->vce.num_rings =3 ;vce_v3_0_set_ring_funcs (adev);vce_v3_0_set_irq_funcs (adev);@@ -671,6 +684,7 @@ static int vce_v3_0_process_interrupt(struct amdgpu_device *adev, switch (entry->src_data) {case 0 :case 1 : +case 2 :amdgpu_fence_process (&adev->vce.ring[entry->src_data]);break ;default:
--
2.5.5
Quoted 11 lines
Quoted 8 lines
_______________________________________________
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
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx