Skip to content

Commit 23df349

Browse files
Lijo Lazaralexdeucher
authored andcommitted
drm/amdgpu: Add empty HDP flush function to JPEG v4.0.3
JPEG v4.0.3 doesn't support HDP flush when RRMT is enabled. Instead, mmsch fw will do the flush. This change is necessary for JPEG v4.0.3, no need for backward compatibility Signed-off-by: Lijo Lazar <lijo.lazar@amd.com> Signed-off-by: Jane Jian <Jane.Jian@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 585e3fd)
1 parent df65aab commit 23df349

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,13 @@ static uint64_t jpeg_v4_0_3_dec_ring_get_wptr(struct amdgpu_ring *ring)
621621
ring->pipe ? (0x40 * ring->pipe - 0xc80) : 0);
622622
}
623623

624+
static void jpeg_v4_0_3_ring_emit_hdp_flush(struct amdgpu_ring *ring)
625+
{
626+
/* JPEG engine access for HDP flush doesn't work when RRMT is enabled.
627+
* This is a workaround to avoid any HDP flush through JPEG ring.
628+
*/
629+
}
630+
624631
/**
625632
* jpeg_v4_0_3_dec_ring_set_wptr - set write pointer
626633
*
@@ -1072,6 +1079,7 @@ static const struct amdgpu_ring_funcs jpeg_v4_0_3_dec_ring_vm_funcs = {
10721079
.emit_ib = jpeg_v4_0_3_dec_ring_emit_ib,
10731080
.emit_fence = jpeg_v4_0_3_dec_ring_emit_fence,
10741081
.emit_vm_flush = jpeg_v4_0_3_dec_ring_emit_vm_flush,
1082+
.emit_hdp_flush = jpeg_v4_0_3_ring_emit_hdp_flush,
10751083
.test_ring = amdgpu_jpeg_dec_ring_test_ring,
10761084
.test_ib = amdgpu_jpeg_dec_ring_test_ib,
10771085
.insert_nop = jpeg_v4_0_3_dec_ring_nop,

0 commit comments

Comments
 (0)