drm/amdgpu: add no_user_fence flag to ring funcs
Subsystems (2)
PATCH 1/6 drm/amdgpu: add no_user_fence flag to ring funcs
So we can generalize the no user fence supported engine
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1 -0
@@ -114,6 +114,7 @@ struct amdgpu_ring_funcs {uint32_t align_mask;u32 nop;bool support_64bit_ptrs; +bool no_user_fence;unsigned vmhub;unsigned extra_dw;
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 2/6 drm/amdgpu/UVD: set no_user_fence flag to true
There is no user fence support for UVD
--- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 1 + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 1 + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 3 +++ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 ++ 4 files changed, 7 insertions(+)
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +1 -0
@@ -741,6 +741,7 @@ static const struct amdgpu_ring_funcs uvd_v4_2_ring_funcs = { .type = AMDGPU_RING_TYPE_UVD, .align_mask = 0xf, .support_64bit_ptrs = false, + .no_user_fence = true, .get_rptr = uvd_v4_2_ring_get_rptr, .get_wptr = uvd_v4_2_ring_get_wptr, .set_wptr = uvd_v4_2_ring_set_wptr,
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +1 -0
@@ -849,6 +849,7 @@ static const struct amdgpu_ring_funcs uvd_v5_0_ring_funcs = { .type = AMDGPU_RING_TYPE_UVD, .align_mask = 0xf, .support_64bit_ptrs = false, + .no_user_fence = true, .get_rptr = uvd_v5_0_ring_get_rptr, .get_wptr = uvd_v5_0_ring_get_wptr, .set_wptr = uvd_v5_0_ring_set_wptr,
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +3 -0
@@ -1502,6 +1502,7 @@ static const struct amdgpu_ring_funcs uvd_v6_0_ring_phys_funcs = { .type = AMDGPU_RING_TYPE_UVD, .align_mask = 0xf, .support_64bit_ptrs = false, + .no_user_fence = true, .get_rptr = uvd_v6_0_ring_get_rptr, .get_wptr = uvd_v6_0_ring_get_wptr, .set_wptr = uvd_v6_0_ring_set_wptr,
@@ -1527,6 +1528,7 @@ static const struct amdgpu_ring_funcs uvd_v6_0_ring_vm_funcs = { .type = AMDGPU_RING_TYPE_UVD, .align_mask = 0xf, .support_64bit_ptrs = false, + .no_user_fence = true, .get_rptr = uvd_v6_0_ring_get_rptr, .get_wptr = uvd_v6_0_ring_get_wptr, .set_wptr = uvd_v6_0_ring_set_wptr,
@@ -1555,6 +1557,7 @@ static const struct amdgpu_ring_funcs uvd_v6_0_enc_ring_vm_funcs = { .align_mask = 0x3f, .nop = HEVC_ENC_CMD_NO_OP, .support_64bit_ptrs = false, + .no_user_fence = true, .get_rptr = uvd_v6_0_enc_ring_get_rptr, .get_wptr = uvd_v6_0_enc_ring_get_wptr, .set_wptr = uvd_v6_0_enc_ring_set_wptr,
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +2 -0
@@ -1759,6 +1759,7 @@ static const struct amdgpu_ring_funcs uvd_v7_0_ring_vm_funcs = { .type = AMDGPU_RING_TYPE_UVD, .align_mask = 0xf, .support_64bit_ptrs = false, + .no_user_fence = true, .vmhub = AMDGPU_MMHUB, .get_rptr = uvd_v7_0_ring_get_rptr, .get_wptr = uvd_v7_0_ring_get_wptr,
@@ -1791,6 +1792,7 @@ static const struct amdgpu_ring_funcs uvd_v7_0_enc_ring_vm_funcs = { .align_mask = 0x3f, .nop = HEVC_ENC_CMD_NO_OP, .support_64bit_ptrs = false, + .no_user_fence = true, .vmhub = AMDGPU_MMHUB, .get_rptr = uvd_v7_0_enc_ring_get_rptr, .get_wptr = uvd_v7_0_enc_ring_get_wptr,
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/6 drm/amdgpu/VCE: set no_user_fence flag to true
In reply to a message not in the archiveThere is no user fence support for VCE
--- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 1 + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 1 + 3 files changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1 -0
@@ -605,6 +605,7 @@ static const struct amdgpu_ring_funcs vce_v2_0_ring_funcs = { .align_mask = 0xf, .nop = VCE_CMD_NO_OP, .support_64bit_ptrs = false, + .no_user_fence = true, .get_rptr = vce_v2_0_ring_get_rptr, .get_wptr = vce_v2_0_ring_get_wptr, .set_wptr = vce_v2_0_ring_set_wptr,
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +2 -0
@@ -894,6 +894,7 @@ static const struct amdgpu_ring_funcs vce_v3_0_ring_phys_funcs = { .align_mask = 0xf, .nop = VCE_CMD_NO_OP, .support_64bit_ptrs = false, + .no_user_fence = true, .get_rptr = vce_v3_0_ring_get_rptr, .get_wptr = vce_v3_0_ring_get_wptr, .set_wptr = vce_v3_0_ring_set_wptr,
@@ -917,6 +918,7 @@ static const struct amdgpu_ring_funcs vce_v3_0_ring_vm_funcs = { .align_mask = 0xf, .nop = VCE_CMD_NO_OP, .support_64bit_ptrs = false, + .no_user_fence = true, .get_rptr = vce_v3_0_ring_get_rptr, .get_wptr = vce_v3_0_ring_get_wptr, .set_wptr = vce_v3_0_ring_set_wptr,
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +1 -0
@@ -1069,6 +1069,7 @@ static const struct amdgpu_ring_funcs vce_v4_0_ring_vm_funcs = { .align_mask = 0x3f, .nop = VCE_CMD_NO_OP, .support_64bit_ptrs = false, + .no_user_fence = true, .vmhub = AMDGPU_MMHUB, .get_rptr = vce_v4_0_ring_get_rptr, .get_wptr = vce_v4_0_ring_get_wptr,
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/6 drm/amdgpu/VCN: set no_user_fence flag to true
In reply to a message not in the archiveThere is no user fence support for VCN
--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +3 -0
@@ -2054,6 +2054,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .type = AMDGPU_RING_TYPE_VCN_DEC, .align_mask = 0xf, .support_64bit_ptrs = false, + .no_user_fence = true, .vmhub = AMDGPU_MMHUB, .get_rptr = vcn_v1_0_dec_ring_get_rptr, .get_wptr = vcn_v1_0_dec_ring_get_wptr,
@@ -2087,6 +2088,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = { .align_mask = 0x3f, .nop = VCN_ENC_CMD_NO_OP, .support_64bit_ptrs = false, + .no_user_fence = true, .vmhub = AMDGPU_MMHUB, .get_rptr = vcn_v1_0_enc_ring_get_rptr, .get_wptr = vcn_v1_0_enc_ring_get_wptr,
@@ -2118,6 +2120,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_jpeg_ring_vm_funcs = { .align_mask = 0xf, .nop = PACKET0(0x81ff, 0), .support_64bit_ptrs = false, + .no_user_fence = true, .vmhub = AMDGPU_MMHUB, .extra_dw = 64, .get_rptr = vcn_v1_0_jpeg_ring_get_rptr,
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/6 drm/amdgpu: check no_user_fence flag for engines
In reply to a message not in the archiveTo replace checking ring type and make them generic
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +2 -4
@@ -1008,11 +1008,9 @@ static int amdgpu_cs_ib_fill(struct amdgpu_device *adev, j++; } -/* UVD & VCE fw doesn't support user fences */ +/* MM engine doesn't support user fences */ ring =to_amdgpu_ring (parser->entity->rq->sched); -if (parser->job->uf_addr && ( - ring->funcs->type ==AMDGPU_RING_TYPE_UVD || - ring->funcs->type ==AMDGPU_RING_TYPE_VCE )) +if (parser->job->uf_addr && ring->funcs->no_user_fence)return -EINVAL ;return amdgpu_ctx_wait_prev_fence (parser->ctx, parser->entity);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/6 drm/amdgpu: remove MM engine related WARN_ON for user fence
In reply to a message not in the archiveSince the check aleady done with command submission check
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 -- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 -- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 -- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 ---- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 5 ----- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 -- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 6 ------ 7 files changed, 23 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +0 -2
@@ -1053,8 +1053,6 @@ void amdgpu_vce_ring_emit_ib(struct amdgpu_ring *ring,void amdgpu_vce_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,VCE_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +0 -2
@@ -446,8 +446,6 @@ static void uvd_v4_2_stop(struct amdgpu_device *adev)static void uvd_v4_2_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (mmUVD_CONTEXT_ID,0 ));amdgpu_ring_write (ring, seq);amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0,0 ));
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +0 -2
@@ -462,8 +462,6 @@ static void uvd_v5_0_stop(struct amdgpu_device *adev)static void uvd_v5_0_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (mmUVD_CONTEXT_ID,0 ));amdgpu_ring_write (ring, seq);amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0,0 ));
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +0 -4
@@ -882,8 +882,6 @@ static void uvd_v6_0_stop(struct amdgpu_device *adev)static void uvd_v6_0_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (mmUVD_CONTEXT_ID,0 ));amdgpu_ring_write (ring, seq);amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0,0 ));
@@ -912,8 +910,6 @@ static void uvd_v6_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seqstatic void uvd_v6_0_enc_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,HEVC_ENC_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +0 -5
@@ -1143,8 +1143,6 @@ static void uvd_v7_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seq {struct amdgpu_device *adev = ring->adev; -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD , ring->me, mmUVD_CONTEXT_ID),0 ));amdgpu_ring_write (ring, seq);
@@ -1180,9 +1178,6 @@ static void uvd_v7_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seqstatic void uvd_v7_0_enc_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { - -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,HEVC_ENC_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +0 -2
@@ -963,8 +963,6 @@ static void vce_v4_0_ring_emit_ib(struct amdgpu_ring *ring, struct amdgpu_job *jstatic void vce_v4_0_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,VCE_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +0 -6
@@ -1334,8 +1334,6 @@ static void vcn_v1_0_dec_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 {struct amdgpu_device *adev = ring->adev; -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_CONTEXT_ID),0 ));amdgpu_ring_write (ring, seq);
@@ -1506,8 +1504,6 @@ static void vcn_v1_0_enc_ring_set_wptr(struct amdgpu_ring *ring)static void vcn_v1_0_enc_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,VCN_ENC_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));
@@ -1666,8 +1662,6 @@ static void vcn_v1_0_jpeg_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u6 {struct amdgpu_device *adev = ring->adev; -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKETJ (SOC15_REG_OFFSET (UVD ,0 , mmUVD_JPEG_GPCOM_DATA0),0 ,0 ,PACKETJ_TYPE0 ));amdgpu_ring_write (ring, seq);
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]
Alex Deucher
Reviewed-byRe: [PATCH 6/6] drm/amdgpu: remove MM engine related WARN_ON for user fence
Quoted 2 lines · Leo
Since the check aleady done with command submission check
Missing signed-off-by.
patches 1-5 are:
As for this patch, I don't think these are directly related to user fences and we may want to keep them.
Alex
Quoted 141 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 -- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 -- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 -- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 ---- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 5 ----- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 -- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 6 ------ 7 files changed, 23 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +0
-2@@ -1053,8 +1053,6 @@ void amdgpu_vce_ring_emit_ib(struct amdgpu_ring *ring,void amdgpu_vce_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,VCE_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +0
-2@@ -446,8 +446,6 @@ static void uvd_v4_2_stop(struct amdgpu_device *adev)static void uvd_v4_2_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (mmUVD_CONTEXT_ID,0 ));amdgpu_ring_write (ring, seq);amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0,0 ));drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +0
-2@@ -462,8 +462,6 @@ static void uvd_v5_0_stop(struct amdgpu_device *adev)static void uvd_v5_0_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (mmUVD_CONTEXT_ID,0 ));amdgpu_ring_write (ring, seq);amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0,0 ));drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +0
-4@@ -882,8 +882,6 @@ static void uvd_v6_0_stop(struct amdgpu_device *adev)static void uvd_v6_0_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (mmUVD_CONTEXT_ID,0 ));amdgpu_ring_write (ring, seq);amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0,0 ));@@ -912,8 +910,6 @@ static void uvd_v6_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seqstatic void uvd_v6_0_enc_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,HEVC_ENC_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +0
-5@@ -1143,8 +1143,6 @@ static void uvd_v7_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seq {struct amdgpu_device *adev = ring->adev; -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD , ring->me, mmUVD_CONTEXT_ID),0 ));amdgpu_ring_write (ring, seq);@@ -1180,9 +1178,6 @@ static void uvd_v7_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seqstatic void uvd_v7_0_enc_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { - -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,HEVC_ENC_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +0
-2@@ -963,8 +963,6 @@ static void vce_v4_0_ring_emit_ib(struct amdgpu_ring *ring, struct amdgpu_job *jstatic void vce_v4_0_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,VCE_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +0
-7@@ -1334,8 +1334,6 @@ static void vcn_v1_0_dec_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 {struct amdgpu_device *adev = ring->adev; -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_CONTEXT_ID),0 ));amdgpu_ring_write (ring, seq);@@ -1506,8 +1504,6 @@ static void vcn_v1_0_enc_ring_set_wptr(struct amdgpu_ring *ring)static void vcn_v1_0_enc_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,VCN_ENC_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));@@ -1666,8 +1662,6 @@ static void vcn_v1_0_jpeg_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u6 {struct amdgpu_device *adev = ring->adev; -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKETJ (SOC15_REG_OFFSET (UVD ,0 , mmUVD_JPEG_GPCOM_DATA0),0 ,0 ,PACKETJ_TYPE0 ));amdgpu_ring_write (ring, seq); --2.17.1
Quoted 4 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
A message that is not in the archive (sent off-list or not yet received): CADnq5_P7Aa=YhxLNi4Wt8y_cTJmiW8OhPgcpDn5hzyiY4e4WYg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [PATCH 6/6] drm/amdgpu: remove MM engine related WARN_ON for user fence
Quoted 11 lines · Alex Deucher
[CAUTION: External Email]
Quoted 1 line · Leo
Since the check aleady done with command submission check
Missing signed-off-by.
patches 1-5 are:
Reviewed-by Alex Deucher <[email protected]>As for this patch, I don't think these are directly related to user fences and we may want to keep them.
Okay. I will drop this patch.
Thanks for the reviews.
Leo
Quoted 144 lines
Alex
Quoted 141 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 -- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 -- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 -- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 ---- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 5 ----- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 -- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 6 ------ 7 files changed, 23 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +0
-2@@ -1053,8 +1053,6 @@ void amdgpu_vce_ring_emit_ib(struct amdgpu_ring *ring,void amdgpu_vce_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,VCE_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +0
-2@@ -446,8 +446,6 @@ static void uvd_v4_2_stop(struct amdgpu_device *adev)static void uvd_v4_2_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (mmUVD_CONTEXT_ID,0 ));amdgpu_ring_write (ring, seq);amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0,0 ));drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +0
-2@@ -462,8 +462,6 @@ static void uvd_v5_0_stop(struct amdgpu_device *adev)static void uvd_v5_0_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (mmUVD_CONTEXT_ID,0 ));amdgpu_ring_write (ring, seq);amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0,0 ));drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +0
-4@@ -882,8 +882,6 @@ static void uvd_v6_0_stop(struct amdgpu_device *adev)static void uvd_v6_0_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (mmUVD_CONTEXT_ID,0 ));amdgpu_ring_write (ring, seq);amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0,0 ));@@ -912,8 +910,6 @@ static void uvd_v6_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seqstatic void uvd_v6_0_enc_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,HEVC_ENC_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +0
-5@@ -1143,8 +1143,6 @@ static void uvd_v7_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seq {struct amdgpu_device *adev = ring->adev; -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD , ring->me, mmUVD_CONTEXT_ID),0 ));amdgpu_ring_write (ring, seq);@@ -1180,9 +1178,6 @@ static void uvd_v7_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seqstatic void uvd_v7_0_enc_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { - -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,HEVC_ENC_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +0
-2@@ -963,8 +963,6 @@ static void vce_v4_0_ring_emit_ib(struct amdgpu_ring *ring, struct amdgpu_job *jstatic void vce_v4_0_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,VCE_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +0
-7@@ -1334,8 +1334,6 @@ static void vcn_v1_0_dec_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 {struct amdgpu_device *adev = ring->adev; -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_CONTEXT_ID),0 ));amdgpu_ring_write (ring, seq);@@ -1506,8 +1504,6 @@ static void vcn_v1_0_enc_ring_set_wptr(struct amdgpu_ring *ring)static void vcn_v1_0_enc_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,VCN_ENC_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));@@ -1666,8 +1662,6 @@ static void vcn_v1_0_jpeg_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u6 {struct amdgpu_device *adev = ring->adev; -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKETJ (SOC15_REG_OFFSET (UVD ,0 , mmUVD_JPEG_GPCOM_DATA0),0 ,0 ,PACKETJ_TYPE0 ));amdgpu_ring_write (ring, seq); --2.17.1
Quoted 4 lines
Quoted 4 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
A message that is not in the archive (sent off-list or not yet received): 4c83931c-4752-be8b-cca7-9b0cc12cc9dc-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 6/6] drm/amdgpu: remove MM engine related WARN_ON for user fence
Am 08.05.19 um 21:02 schrieb Liu, Leo:
Quoted 5 lines · Alex Deucher
Quoted 4 lines
[CAUTION: External Email]
Quoted 1 line · Leo
Since the check aleady done with command submission check
Quoted 8 lines
Quoted 7 lines
Missing signed-off-by.
patches 1-5 are:
Reviewed-by Alex Deucher <[email protected]>As for this patch, I don't think these are directly related to user fences and we may want to keep them.
Okay. I will drop this patch.
Yeah, could be that we internally in the kernel try to submit a 64bit fence to an MM engine at some point.
patches 1-5 are Reviewed-by: Christian König <[email protected]> as well.
Thanks,
Christian.
Quoted 150 lines
Thanks for the reviews.
Leo
Quoted 143 lines
Alex
Quoted 141 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 -- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 -- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 -- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 ---- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 5 ----- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 -- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 6 ------ 7 files changed, 23 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +0
-2@@ -1053,8 +1053,6 @@ void amdgpu_vce_ring_emit_ib(struct amdgpu_ring *ring,void amdgpu_vce_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,VCE_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +0
-2@@ -446,8 +446,6 @@ static void uvd_v4_2_stop(struct amdgpu_device *adev)static void uvd_v4_2_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (mmUVD_CONTEXT_ID,0 ));amdgpu_ring_write (ring, seq);amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0,0 ));drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +0
-2@@ -462,8 +462,6 @@ static void uvd_v5_0_stop(struct amdgpu_device *adev)static void uvd_v5_0_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (mmUVD_CONTEXT_ID,0 ));amdgpu_ring_write (ring, seq);amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0,0 ));drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +0
-4@@ -882,8 +882,6 @@ static void uvd_v6_0_stop(struct amdgpu_device *adev)static void uvd_v6_0_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (mmUVD_CONTEXT_ID,0 ));amdgpu_ring_write (ring, seq);amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0,0 ));@@ -912,8 +910,6 @@ static void uvd_v6_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seqstatic void uvd_v6_0_enc_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,HEVC_ENC_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +0
-5@@ -1143,8 +1143,6 @@ static void uvd_v7_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seq {struct amdgpu_device *adev = ring->adev; -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD , ring->me, mmUVD_CONTEXT_ID),0 ));amdgpu_ring_write (ring, seq);@@ -1180,9 +1178,6 @@ static void uvd_v7_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seqstatic void uvd_v7_0_enc_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { - -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,HEVC_ENC_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +0
-2@@ -963,8 +963,6 @@ static void vce_v4_0_ring_emit_ib(struct amdgpu_ring *ring, struct amdgpu_job *jstatic void vce_v4_0_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,VCE_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +0
-7@@ -1334,8 +1334,6 @@ static void vcn_v1_0_dec_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 {struct amdgpu_device *adev = ring->adev; -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKET0 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_CONTEXT_ID),0 ));amdgpu_ring_write (ring, seq);@@ -1506,8 +1504,6 @@ static void vcn_v1_0_enc_ring_set_wptr(struct amdgpu_ring *ring)static void vcn_v1_0_enc_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned flags) { -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,VCN_ENC_CMD_FENCE );amdgpu_ring_write (ring, addr);amdgpu_ring_write (ring,upper_32_bits (addr));@@ -1666,8 +1662,6 @@ static void vcn_v1_0_jpeg_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u6 {struct amdgpu_device *adev = ring->adev; -WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); -amdgpu_ring_write (ring,PACKETJ (SOC15_REG_OFFSET (UVD ,0 , mmUVD_JPEG_GPCOM_DATA0),0 ,0 ,PACKETJ_TYPE0 ));amdgpu_ring_write (ring, seq); --2.17.1
Quoted 8 lines
Quoted 4 lines
Quoted 4 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