[PATCH] drm/amdgpu: correct emit frame size for vcn dec/enc ring

[Alex Deucher]

On Mon, May 15, 2017 at 6:16 AM, Hawking Zhang <Hawking.Zhang at amd.com> wrote:
> only mmhub will be invalidated during vcn dec/enc vm flush
>
> Change-Id: Ide47c892c98a12c6a50918237595135fd7bf208b
> Signed-off-by: Hawking Zhang <Hawking.Zhang at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> index 6bd9bb7..8a25bba 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> @@ -1111,7 +1111,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = {
>         .set_wptr = vcn_v1_0_dec_ring_set_wptr,
>         .emit_frame_size =
>                 2 + /* vcn_v1_0_dec_ring_emit_hdp_invalidate */
> -               34 * AMDGPU_MAX_VMHUBS + /* vcn_v1_0_dec_ring_emit_vm_flush */
> +               34 + /* vcn_v1_0_dec_ring_emit_vm_flush */
>                 14 + 14 + /* vcn_v1_0_dec_ring_emit_fence x2 vm fence */
>                 6,
>         .emit_ib_size = 8, /* vcn_v1_0_dec_ring_emit_ib */
> @@ -1139,7 +1139,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = {
>         .get_wptr = vcn_v1_0_enc_ring_get_wptr,
>         .set_wptr = vcn_v1_0_enc_ring_set_wptr,
>         .emit_frame_size =
> -               17 * AMDGPU_MAX_VMHUBS + /* vcn_v1_0_enc_ring_emit_vm_flush */
> +               17 + /* vcn_v1_0_enc_ring_emit_vm_flush */
>                 5 + 5 + /* vcn_v1_0_enc_ring_emit_fence x2 vm fence */
>                 1, /* vcn_v1_0_enc_ring_insert_end */
>         .emit_ib_size = 5, /* vcn_v1_0_enc_ring_emit_ib */
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx