diff --git a/src/amd/vulkan/layers/radv_rmv_layer.c b/src/amd/vulkan/layers/radv_rmv_layer.c
new file mode 100644
index 00000000000..6ecad7ebee6
--- /dev/null
+++ b/src/amd/vulkan/layers/radv_rmv_layer.c
@@ -0,0 +1,137 @@
+/*
+ * Copyright © 2022 Friedrich Vock
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "rmv/vk_rmv_common.h"
+#include "rmv/vk_rmv_tokens.h"
+#include "radv_private.h"
+#include "vk_common_entrypoints.h"
+#include "wsi_common_entrypoints.h"
+
+VKAPI_ATTR VkResult VKAPI_CALL
+rmv_QueuePresentKHR(VkQueue _queue, const VkPresentInfoKHR *pPresentInfo)
+{
+   RADV_FROM_HANDLE(radv_queue, queue, _queue);
+   struct radv_device *device = queue->device;
+
+   VkResult res = queue->device->layer_dispatch.rmv.QueuePresentKHR(_queue, pPresentInfo);
+   if (res != VK_SUCCESS || !device->vk.memory_trace_data.is_enabled)
+      return res;
+
+   vk_rmv_log_misc_token(&device->vk, VK_RMV_MISC_EVENT_TYPE_PRESENT);
+
+   simple_mtx_lock(&device->vk.memory_trace_data.token_mtx);
+   radv_rmv_collect_trace_events(device);
+   vk_rmv_handle_present_locked(&device->vk);
+   simple_mtx_unlock(&device->vk.memory_trace_data.token_mtx);
+
+   return VK_SUCCESS;
+}
+
+VKAPI_ATTR VkResult VKAPI_CALL
+rmv_FlushMappedMemoryRanges(VkDevice _device, uint32_t memoryRangeCount,
+                            const VkMappedMemoryRange *pMemoryRanges)
+{
+   RADV_FROM_HANDLE(radv_device, device, _device);
+
+   VkResult res =
+      device->layer_dispatch.rmv.FlushMappedMemoryRanges(_device, memoryRangeCount, pMemoryRanges);
+   if (res != VK_SUCCESS || !device->vk.memory_trace_data.is_enabled)
+      return res;
+
+   vk_rmv_log_misc_token(&device->vk, VK_RMV_MISC_EVENT_TYPE_FLUSH_MAPPED_RANGE);
+
+   return VK_SUCCESS;
+}
+
+VKAPI_ATTR VkResult VKAPI_CALL
+rmv_InvalidateMappedMemoryRanges(VkDevice _device, uint32_t memoryRangeCount,
+                                 const VkMappedMemoryRange *pMemoryRanges)
+{
+   RADV_FROM_HANDLE(radv_device, device, _device);
+
+   VkResult res = device->layer_dispatch.rmv.InvalidateMappedMemoryRanges(_device, memoryRangeCount,
+                                                                          pMemoryRanges);
+   if (res != VK_SUCCESS || !device->vk.memory_trace_data.is_enabled)
+      return res;
+
+   vk_rmv_log_misc_token(&device->vk, VK_RMV_MISC_EVENT_TYPE_INVALIDATE_RANGES);
+
+   return VK_SUCCESS;
+}
+
+VKAPI_ATTR VkResult VKAPI_CALL
+rmv_DebugMarkerSetObjectNameEXT(VkDevice device, const VkDebugMarkerObjectNameInfoEXT *pNameInfo)
+{
+   assert(pNameInfo->sType == VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT);
+   VkDebugUtilsObjectNameInfoEXT name_info;
+   name_info.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT;
+   name_info.objectType = pNameInfo->objectType;
+   name_info.objectHandle = pNameInfo->object;
+   name_info.pObjectName = pNameInfo->pObjectName;
+   return rmv_SetDebugUtilsObjectNameEXT(device, &name_info);
+}
+
+VKAPI_ATTR VkResult VKAPI_CALL
+rmv_SetDebugUtilsObjectNameEXT(VkDevice _device, const VkDebugUtilsObjectNameInfoEXT *pNameInfo)
+{
+   assert(pNameInfo->sType == VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT);
+   RADV_FROM_HANDLE(radv_device, device, _device);
+
+   VkResult result = device->layer_dispatch.rmv.SetDebugUtilsObjectNameEXT(_device, pNameInfo);
+   if (result != VK_SUCCESS || !device->vk.memory_trace_data.is_enabled)
+      return result;
+
+   switch (pNameInfo->objectType) {
+   /* only name object types we care about */
+   case VK_OBJECT_TYPE_BUFFER:
+   case VK_OBJECT_TYPE_DEVICE_MEMORY:
+   case VK_OBJECT_TYPE_IMAGE:
+   case VK_OBJECT_TYPE_EVENT:
+   case VK_OBJECT_TYPE_QUERY_POOL:
+   case VK_OBJECT_TYPE_DESCRIPTOR_POOL:
+   case VK_OBJECT_TYPE_COMMAND_BUFFER:
+      break;
+   default:
+      return VK_SUCCESS;
+   }
+
+   size_t name_len = strlen(pNameInfo->pObjectName);
+   char *name_buf = malloc(name_len + 1);
+   if (!name_buf) {
+      /*
+       * Silently fail, so that applications may still continue if possible.
+       */
+      return VK_SUCCESS;
+   }
+   strcpy(name_buf, pNameInfo->pObjectName);
+
+   struct vk_rmv_userdata_token token;
+   token.name = name_buf;
+   token.resource_id = _mesa_hash_data(&pNameInfo->objectHandle, sizeof(uint64_t));
+
+   simple_mtx_lock(&device->vk.memory_trace_data.token_mtx);
+   vk_rmv_emit_token(&device->vk.memory_trace_data, VK_RMV_TOKEN_TYPE_USERDATA, &token);
+   simple_mtx_unlock(&device->vk.memory_trace_data.token_mtx);
+
+   return VK_SUCCESS;
+}
\ No newline at end of file
diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
index 5e10f831424..7f0bcfa102a 100644
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@@ -30,6 +30,7 @@ radv_entrypoints_gen_command += [
   # Tracing layer entrypoints
   '--device-prefix', 'sqtt',
   '--device-prefix', 'rra',
+  '--device-prefix', 'rmv',
 
   # Application layer entrypoints
   '--device-prefix', 'metro_exodus',
@@ -46,6 +47,7 @@ radv_entrypoints = custom_target(
 libradv_files = files(
   'bvh/bvh.h',
   'layers/radv_metro_exodus.c',
+  'layers/radv_rmv_layer.c',
   'layers/radv_rra_layer.c',
   'layers/radv_sqtt_layer.c',
   'winsys/null/radv_null_bo.c',
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index e03c65e4c64..f545aba5858 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -840,6 +840,7 @@ enum radv_dispatch_table {
    RADV_APP_DISPATCH_TABLE,
    RADV_RGP_DISPATCH_TABLE,
    RADV_RRA_DISPATCH_TABLE,
+   RADV_RMV_DISPATCH_TABLE,
    RADV_DISPATCH_TABLE_COUNT,
 };
 
@@ -847,6 +848,7 @@ struct radv_layer_dispatch_tables {
    struct vk_device_dispatch_table app;
    struct vk_device_dispatch_table rgp;
    struct vk_device_dispatch_table rra;
+   struct vk_device_dispatch_table rmv;
 };
 
 struct radv_device {