drm/amd/amdgpu/vcn_v2_0: Mark RB commands as KMD commands
Subsystems (2)
PATCH v3 1/2 drm/amd/amdgpu/vcn_v2_0: Mark RB commands as KMD commands
Sets the CMD_SOURCE bit for VCN 2.0 Decoder Ring Buffer commands. This bit was previously set by the RBC HW on older firmware. Newer firmware uses a SW RBC and this bit has to be set by the driver.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +1 -0
@@ -30,6 +30,7 @@#define AMDGPU_VCN_FIRMWARE_OFFSET 256#define AMDGPU_VCN_MAX_ENC_RINGS 3 +#define VCN_DEC_KMD_CMD 0x80000000#define VCN_DEC_CMD_FENCE 0x00000000#define VCN_DEC_CMD_TRAP 0x00000001#define VCN_DEC_CMD_WRITE_REG 0x00000004
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +6 -6
@@ -1488,7 +1488,7 @@ static void vcn_v2_0_dec_ring_insert_start(struct amdgpu_ring *ring)amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0_INTERNAL_OFFSET,0 ));amdgpu_ring_write (ring,0 );amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET,0 )); -amdgpu_ring_write (ring,VCN_DEC_CMD_PACKET_START <<1 ); +amdgpu_ring_write (ring,VCN_DEC_KMD_CMD | (VCN_DEC_CMD_PACKET_START <<1 )); }/**
@@ -1501,7 +1501,7 @@ static void vcn_v2_0_dec_ring_insert_start(struct amdgpu_ring *ring)static void vcn_v2_0_dec_ring_insert_end (struct amdgpu_ring *ring) {amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET,0 )); -amdgpu_ring_write (ring,VCN_DEC_CMD_PACKET_END <<1 ); +amdgpu_ring_write (ring,VCN_DEC_KMD_CMD | (VCN_DEC_CMD_PACKET_END <<1 )); }/**
@@ -1546,7 +1546,7 @@ static void vcn_v2_0_dec_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64amdgpu_ring_write (ring,upper_32_bits (addr) &0xff );amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET,0 )); -amdgpu_ring_write (ring,VCN_DEC_CMD_FENCE <<1 ); +amdgpu_ring_write (ring,VCN_DEC_KMD_CMD | (VCN_DEC_CMD_FENCE <<1 ));amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0_INTERNAL_OFFSET,0 ));amdgpu_ring_write (ring,0 );
@@ -1556,7 +1556,7 @@ static void vcn_v2_0_dec_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET,0 )); -amdgpu_ring_write (ring,VCN_DEC_CMD_TRAP <<1 ); +amdgpu_ring_write (ring,VCN_DEC_KMD_CMD | (VCN_DEC_CMD_TRAP <<1 )); }/**
@@ -1600,7 +1600,7 @@ static void vcn_v2_0_dec_ring_emit_reg_wait(struct amdgpu_ring *ring,amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET,0 )); -amdgpu_ring_write (ring,VCN_DEC_CMD_REG_READ_COND_WAIT <<1 ); +amdgpu_ring_write (ring,VCN_DEC_KMD_CMD | (VCN_DEC_CMD_REG_READ_COND_WAIT <<1 )); } static void vcn_v2_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring,
@@ -1629,7 +1629,7 @@ static void vcn_v2_0_dec_ring_emit_wreg(struct amdgpu_ring *ring,amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET,0 )); -amdgpu_ring_write (ring,VCN_DEC_CMD_WRITE_REG <<1 ); +amdgpu_ring_write (ring,VCN_DEC_KMD_CMD | (VCN_DEC_CMD_WRITE_REG <<1 )); }/**
Signature · 6 lines
2.17.1 _______________________________________________ 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): [email protected]
PATCH v3 2/2 drm/amd/amdgpu/vcn_v2_0: Move VCN 2.0 specific dec ring test to vcn_v2_0
VCN 2.0 firmware now requires a packet start command to be sent before any other decode ring buffer command.
--- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 32 ++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +31 -1
@@ -2082,6 +2082,36 @@ static int vcn_v2_0_process_interrupt(struct amdgpu_device *adev,return 0 ; } +int vcn_v2_0_dec_ring_test_ring (struct amdgpu_ring *ring) +{ +struct amdgpu_device *adev = ring->adev; +uint32_t tmp =0 ; +unsigned i; +int r; + +WREG32 (adev->vcn.external.scratch9,0xCAFEDEAD ); + r =amdgpu_ring_alloc (ring,4 ); +if (r) +return r; +amdgpu_ring_write (ring,PACKET0 (adev->vcn.internal.cmd,0 )); +amdgpu_ring_write (ring,VCN_DEC_KMD_CMD | (VCN_DEC_CMD_PACKET_START <<1 )); +amdgpu_ring_write (ring,PACKET0 (adev->vcn.internal.scratch9,0 )); +amdgpu_ring_write (ring,0xDEADBEEF ); +amdgpu_ring_commit (ring); +for (i =0 ; i < adev->usec_timeout; i++) { + tmp =RREG32 (adev->vcn.external.scratch9); +if (tmp ==0xDEADBEEF ) +break ; +DRM_UDELAY (1 ); + } + +if (i >= adev->usec_timeout) + r = -ETIMEDOUT ; + +return r; +} + +static int vcn_v2_0_set_powergating_state (void *handle,enum amd_powergating_state state) {
@@ -2145,7 +2175,7 @@ static const struct amdgpu_ring_funcs vcn_v2_0_dec_ring_vm_funcs = { .emit_ib = vcn_v2_0_dec_ring_emit_ib, .emit_fence = vcn_v2_0_dec_ring_emit_fence, .emit_vm_flush = vcn_v2_0_dec_ring_emit_vm_flush, - .test_ring = amdgpu_vcn_dec_ring_test_ring, + .test_ring = vcn_v2_0_dec_ring_test_ring, .test_ib = amdgpu_vcn_dec_ring_test_ib, .insert_nop = vcn_v2_0_dec_ring_insert_nop, .insert_start = vcn_v2_0_dec_ring_insert_start,
Signature · 6 lines
2.17.1 _______________________________________________ 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): [email protected]
Liu, Leo
Reviewed-by Leo LiuRe: [PATCH v3 2/2] drm/amd/amdgpu/vcn_v2_0: Move VCN 2.0 specific dec ring test to vcn_v2_0
Quoted 13 lines · Thong
VCN 2.0 firmware now requires a packet start command to be sent before any other decode ring buffer command.
Signed-off-by Thong Thai <[email protected]>--- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 32 ++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c static int vcn_v2_0_process_interrupt(struct amdgpu_device *adev, · line 2085
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +1
-0@@ -2082,6 +2082,36 @@ static int vcn_v2_0_process_interrupt(struct amdgpu_device *adev,return 0 ; } +int vcn_v2_0_dec_ring_test_ring (struct amdgpu_ring *ring)
Please use static function instead. With that fixed, the patch is
Quoted 33 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +29
-0+{ +struct amdgpu_device *adev = ring->adev; +uint32_t tmp =0 ; +unsigned i; +int r; + +WREG32 (adev->vcn.external.scratch9,0xCAFEDEAD ); + r =amdgpu_ring_alloc (ring,4 ); +if (r) +return r; +amdgpu_ring_write (ring,PACKET0 (adev->vcn.internal.cmd,0 )); +amdgpu_ring_write (ring,VCN_DEC_KMD_CMD | (VCN_DEC_CMD_PACKET_START <<1 )); +amdgpu_ring_write (ring,PACKET0 (adev->vcn.internal.scratch9,0 )); +amdgpu_ring_write (ring,0xDEADBEEF ); +amdgpu_ring_commit (ring); +for (i =0 ; i < adev->usec_timeout; i++) { + tmp =RREG32 (adev->vcn.external.scratch9); +if (tmp ==0xDEADBEEF ) +break ; +DRM_UDELAY (1 ); + } + +if (i >= adev->usec_timeout) + r = -ETIMEDOUT ; + +return r; +} + +static int vcn_v2_0_set_powergating_state (void *handle,enum amd_powergating_state state) {
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c static const struct amdgpu_ring_funcs vcn_v2_0_dec_ring_vm_funcs = { · line 2181
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +1
-1@@ -2145,7 +2175,7 @@ static const struct amdgpu_ring_funcs vcn_v2_0_dec_ring_vm_funcs = { .emit_ib = vcn_v2_0_dec_ring_emit_ib, .emit_fence = vcn_v2_0_dec_ring_emit_fence, .emit_vm_flush = vcn_v2_0_dec_ring_emit_vm_flush, - .test_ring = amdgpu_vcn_dec_ring_test_ring, + .test_ring = vcn_v2_0_dec_ring_test_ring, .test_ib = amdgpu_vcn_dec_ring_test_ib, .insert_nop = vcn_v2_0_dec_ring_insert_nop, .insert_start = vcn_v2_0_dec_ring_insert_start,
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Liu, Leo
Reviewed-by Leo LiuQuoted 15 lines · Thong
Sets the
CMD_SOURCEbit for VCN 2.0 Decoder Ring Buffer commands. This bit was previously set by the RBC HW on older firmware. Newer firmware uses a SW RBC and this bit has to be set by the driver.Signed-off-by Thong Thai <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h line 33
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +1
-0@@ -30,6 +30,7 @@#define AMDGPU_VCN_FIRMWARE_OFFSET 256#define AMDGPU_VCN_MAX_ENC_RINGS 3 +#define VCN_DEC_KMD_CMD 0x80000000
Please get this line aligned with others, with that fixed, the patch is
Quoted 53 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +0
-0#define VCN_DEC_CMD_FENCE 0x00000000#define VCN_DEC_CMD_TRAP 0x00000001#define VCN_DEC_CMD_WRITE_REG 0x00000004drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +5
-5@@ -1488,7 +1488,7 @@ static void vcn_v2_0_dec_ring_insert_start(struct amdgpu_ring *ring)amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0_INTERNAL_OFFSET,0 ));amdgpu_ring_write (ring,0 );amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET,0 )); -amdgpu_ring_write (ring,VCN_DEC_CMD_PACKET_START <<1 ); +amdgpu_ring_write (ring,VCN_DEC_KMD_CMD | (VCN_DEC_CMD_PACKET_START <<1 )); }/** @@ -1501,7 +1501,7 @@ static void vcn_v2_0_dec_ring_insert_start(struct amdgpu_ring *ring)static void vcn_v2_0_dec_ring_insert_end (struct amdgpu_ring *ring) {amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET,0 )); -amdgpu_ring_write (ring,VCN_DEC_CMD_PACKET_END <<1 ); +amdgpu_ring_write (ring,VCN_DEC_KMD_CMD | (VCN_DEC_CMD_PACKET_END <<1 )); }/** @@ -1546,7 +1546,7 @@ static void vcn_v2_0_dec_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64amdgpu_ring_write (ring,upper_32_bits (addr) &0xff );amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET,0 )); -amdgpu_ring_write (ring,VCN_DEC_CMD_FENCE <<1 ); +amdgpu_ring_write (ring,VCN_DEC_KMD_CMD | (VCN_DEC_CMD_FENCE <<1 ));amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0_INTERNAL_OFFSET,0 ));amdgpu_ring_write (ring,0 );@@ -1556,7 +1556,7 @@ static void vcn_v2_0_dec_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET,0 )); -amdgpu_ring_write (ring,VCN_DEC_CMD_TRAP <<1 ); +amdgpu_ring_write (ring,VCN_DEC_KMD_CMD | (VCN_DEC_CMD_TRAP <<1 )); }/** @@ -1600,7 +1600,7 @@ static void vcn_v2_0_dec_ring_emit_reg_wait(struct amdgpu_ring *ring,amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET,0 )); -amdgpu_ring_write (ring,VCN_DEC_CMD_REG_READ_COND_WAIT <<1 ); +amdgpu_ring_write (ring,VCN_DEC_KMD_CMD | (VCN_DEC_CMD_REG_READ_COND_WAIT <<1 )); } static void vcn_v2_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring,
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c static void vcn_v2_0_dec_ring_emit_wreg(struct amdgpu_ring *ring, · line 1635
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +1
-1@@ -1629,7 +1629,7 @@ static void vcn_v2_0_dec_ring_emit_wreg(struct amdgpu_ring *ring,amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET,0 )); -amdgpu_ring_write (ring,VCN_DEC_CMD_WRITE_REG <<1 ); +amdgpu_ring_write (ring,VCN_DEC_KMD_CMD | (VCN_DEC_CMD_WRITE_REG <<1 )); }/**
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx