diff --git a/projects/rocr-runtime/src/fmm.c b/projects/rocr-runtime/src/fmm.c
index 436af68223..ff02fa9394 100644
--- a/projects/rocr-runtime/src/fmm.c
+++ b/projects/rocr-runtime/src/fmm.c
@@ -1906,23 +1906,32 @@ static HSAKMT_STATUS get_process_apertures(
  */
 #define DRM_FIRST_RENDER_NODE 128
 #define DRM_LAST_RENDER_NODE 255
-static int drm_render_fds[DRM_LAST_RENDER_NODE + 1 - DRM_FIRST_RENDER_NODE];
+#define DRM_MAX_PARTITIONS 8
+static int drm_render_fds[DRM_LAST_RENDER_NODE + 1 - DRM_FIRST_RENDER_NODE][DRM_MAX_PARTITIONS];
+static uint32_t gpu_id_fd_map[DRM_LAST_RENDER_NODE + 1 - DRM_FIRST_RENDER_NODE][DRM_MAX_PARTITIONS];
 
-int open_drm_render_device(int minor)
+int open_drm_render_device(int minor, uint32_t gpu_id)
 {
 	char path[128];
-	int index, fd;
+	int fd, render_idx, gpu_id_idx;
 
 	if (minor < DRM_FIRST_RENDER_NODE || minor > DRM_LAST_RENDER_NODE) {
 		pr_err("DRM render minor %d out of range [%d, %d]\n", minor,
 		       DRM_FIRST_RENDER_NODE, DRM_LAST_RENDER_NODE);
 		return -EINVAL;
 	}
-	index = minor - DRM_FIRST_RENDER_NODE;
+	render_idx = minor - DRM_FIRST_RENDER_NODE;
 
 	/* If the render node was already opened, keep using the same FD */
-	if (drm_render_fds[index])
-		return drm_render_fds[index];
+	for (gpu_id_idx = 0; gpu_id_idx < DRM_MAX_PARTITIONS &&
+			gpu_id_fd_map[render_idx][gpu_id_idx] != 0; gpu_id_idx++)
+		if (gpu_id_fd_map[render_idx][gpu_id_idx] == gpu_id)
+			return drm_render_fds[render_idx][gpu_id_idx];
+
+	if (gpu_id_idx >= DRM_MAX_PARTITIONS) {
+		pr_err("Requesting more FDs for same render node than max supported partitions!\n");
+		return -EINVAL;
+	}
 
 	sprintf(path, "/dev/dri/renderD%d", minor);
 	fd = open(path, O_RDWR | O_CLOEXEC);
@@ -1934,7 +1943,8 @@ int open_drm_render_device(int minor)
 		}
 		return -errno;
 	}
-	drm_render_fds[index] = fd;
+	gpu_id_fd_map[render_idx][gpu_id_idx] = gpu_id;
+	drm_render_fds[render_idx][gpu_id_idx] = fd;
 
 	return fd;
 }
@@ -2325,7 +2335,7 @@ HSAKMT_STATUS fmm_init_process_apertures(unsigned int NumNodes)
 
 		/* Skip non-GPU nodes */
 		if (props.KFDGpuID) {
-			int fd = open_drm_render_device(props.DrmRenderMinor);
+			int fd = open_drm_render_device(props.DrmRenderMinor, props.KFDGpuID);
 			if (fd <= 0) {
 				ret = HSAKMT_STATUS_ERROR;
 				goto gpu_mem_init_failed;
@@ -3867,15 +3877,17 @@ static void fmm_clear_aperture(manageable_aperture_t *app)
  */
 void fmm_clear_all_mem(void)
 {
-	uint32_t i;
+	uint32_t i, j;
 	void *map_addr;
 
 	/* Close render node FDs. The child process needs to open new ones */
-	for (i = 0; i <= DRM_LAST_RENDER_NODE - DRM_FIRST_RENDER_NODE; i++)
-		if (drm_render_fds[i]) {
-			close(drm_render_fds[i]);
-			drm_render_fds[i] = 0;
+	for (i = 0; i <= DRM_LAST_RENDER_NODE - DRM_FIRST_RENDER_NODE; i++) {
+		for (j = 0; j < DRM_MAX_PARTITIONS && drm_render_fds[i][j] != 0; j++) {
+			close(drm_render_fds[i][j]);
+			drm_render_fds[i][j] = 0;
+			gpu_id_fd_map[i][j] = 0;
 		}
+	}
 
 	fmm_clear_aperture(&cpuvm_aperture);
 	fmm_clear_aperture(&svm.apertures[SVM_DEFAULT]);
diff --git a/projects/rocr-runtime/src/fmm.h b/projects/rocr-runtime/src/fmm.h
index d0146d74cd..93aa55fb76 100644
--- a/projects/rocr-runtime/src/fmm.h
+++ b/projects/rocr-runtime/src/fmm.h
@@ -93,7 +93,7 @@ HSAKMT_STATUS fmm_register_shared_memory(const HsaSharedMemoryHandle *SharedMemo
 HSAKMT_STATUS fmm_map_to_gpu_nodes(void *address, uint64_t size,
 		uint32_t *nodes_to_map, uint64_t num_of_nodes, uint64_t *gpuvm_address);
 
-int open_drm_render_device(int minor);
+int open_drm_render_device(int minor, uint32_t gpu_id);
 void *mmap_allocate_aligned(int prot, int flags, uint64_t size, uint64_t align,
 			    uint64_t guard_size, void *aper_base, void *aper_limit);
 
diff --git a/projects/rocr-runtime/src/topology.c b/projects/rocr-runtime/src/topology.c
index cc1231808b..ba5802da86 100644
--- a/projects/rocr-runtime/src/topology.c
+++ b/projects/rocr-runtime/src/topology.c
@@ -694,7 +694,7 @@ static HSAKMT_STATUS topology_sysfs_check_node_supported(uint32_t sysfs_node_id,
 	}
 
 	/* Open DRM Render device */
-	ret_value = open_drm_render_device(drm_render_minor);
+	ret_value = open_drm_render_device(drm_render_minor, gpu_id);
 	if (ret_value > 0)
 		*is_node_supported = true;
 	else if (ret_value != -ENOENT && ret_value != -EPERM)