From 5819b4c1d376b3c73228a885f23a6850eeba3829 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 7 Mar 2022 10:31:20 +1000
Subject: [PATCH] radv/winsys: complete ring/ip translations.

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 | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
index 907588c25d6..af26581511a 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
@@ -112,10 +112,22 @@ ring_to_hw_ip(enum ring_type ring)
    switch (ring) {
    case RING_GFX:
       return AMDGPU_HW_IP_GFX;
-   case RING_DMA:
-      return AMDGPU_HW_IP_DMA;
    case RING_COMPUTE:
       return AMDGPU_HW_IP_COMPUTE;
+   case RING_DMA:
+      return AMDGPU_HW_IP_DMA;
+   case RING_UVD:
+      return AMDGPU_HW_IP_UVD;
+   case RING_VCE:
+      return AMDGPU_HW_IP_VCE;
+   case RING_UVD_ENC:
+      return AMDGPU_HW_IP_UVD_ENC;
+   case RING_VCN_DEC:
+      return AMDGPU_HW_IP_VCN_DEC;
+   case RING_VCN_ENC:
+      return AMDGPU_HW_IP_VCN_ENC;
+   case RING_VCN_JPEG:
+      return AMDGPU_HW_IP_VCN_JPEG;
    default:
       unreachable("unsupported ring");
    }
@@ -127,10 +139,22 @@ hw_ip_to_ring(int hw_ip)
    switch (hw_ip) {
    case AMDGPU_HW_IP_GFX:
       return RING_GFX;
-   case AMDGPU_HW_IP_DMA:
-      return RING_DMA;
    case AMDGPU_HW_IP_COMPUTE:
       return RING_COMPUTE;
+   case AMDGPU_HW_IP_DMA:
+      return RING_DMA;
+   case AMDGPU_HW_IP_UVD:
+      return RING_UVD;
+   case AMDGPU_HW_IP_VCE:
+      return RING_VCE;
+   case AMDGPU_HW_IP_UVD_ENC:
+      return RING_UVD_ENC;
+   case AMDGPU_HW_IP_VCN_DEC:
+      return RING_VCN_DEC;
+   case AMDGPU_HW_IP_VCN_ENC:
+      return RING_VCN_ENC;
+   case AMDGPU_HW_IP_VCN_JPEG:
+      return RING_VCN_JPEG;
    default:
       unreachable("unsupported hw ip");
    }