From 31b82afe6ead1966c360d20d412308b472b2e2f4 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 7 Mar 2022 10:34:37 +1000
Subject: [PATCH] radv/winsys: add nop packets for uvd and vcn dec.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15257>
---
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
index af26581511a..e35ff831a19 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
@@ -319,6 +319,11 @@ static uint32_t get_nop_packet(struct radv_amdgpu_cs *cs)
       return cs->ws->info.gfx_ib_pad_with_type2 ?  PKT2_NOP_PAD : PKT3_NOP_PAD;
    case AMDGPU_HW_IP_DMA:
       return cs->ws->info.chip_class <= GFX6 ? 0xF0000000 : SDMA_NOP_PAD;
+   case AMDGPU_HW_IP_UVD:
+   case AMDGPU_HW_IP_UVD_ENC:
+      return PKT2_NOP_PAD;
+   case AMDGPU_HW_IP_VCN_DEC:
+      return 0x81FF;
    default:
       unreachable("Unknown ring type");
    }