[PATCH] drm/amdgpu: update uvd_v6_0_ring_vm_funcs to use new nop packet

Alex Deucher alexdeucher at gmail.com
Fri Jun 29 14:57:46 UTC 2018


Ping?

On Thu, Jun 28, 2018 at 2:37 PM, Alex Deucher <alexdeucher at gmail.com> wrote:
> Was missed when updating the uvd 6 module.
>
> Fixes: 1aac3c9180 (drm/amdgpu: fix insert nop for UVD6 ring)
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> index 1df1c6115341..8ee1c2eaaa14 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> @@ -1569,7 +1569,6 @@ static const struct amdgpu_ring_funcs uvd_v6_0_ring_phys_funcs = {
>  static const struct amdgpu_ring_funcs uvd_v6_0_ring_vm_funcs = {
>         .type = AMDGPU_RING_TYPE_UVD,
>         .align_mask = 0xf,
> -       .nop = PACKET0(mmUVD_NO_OP, 0),
>         .support_64bit_ptrs = false,
>         .get_rptr = uvd_v6_0_ring_get_rptr,
>         .get_wptr = uvd_v6_0_ring_get_wptr,
> @@ -1587,7 +1586,7 @@ static const struct amdgpu_ring_funcs uvd_v6_0_ring_vm_funcs = {
>         .emit_hdp_flush = uvd_v6_0_ring_emit_hdp_flush,
>         .test_ring = uvd_v6_0_ring_test_ring,
>         .test_ib = amdgpu_uvd_ring_test_ib,
> -       .insert_nop = amdgpu_ring_insert_nop,
> +       .insert_nop = uvd_v6_0_ring_insert_nop,
>         .pad_ib = amdgpu_ring_generic_pad_ib,
>         .begin_use = amdgpu_uvd_ring_begin_use,
>         .end_use = amdgpu_uvd_ring_end_use,
> --
> 2.13.6
>


More information about the amd-gfx mailing list