Skip to content

Commit f54c444

Browse files
zackrRoland Scheidegger
authored andcommitted
drm/vmwgfx: Fix error handling in get_node
ttm_mem_type_manager_func.get_node was changed to return -ENOSPC instead of setting the node pointer to NULL. Unfortunately vmwgfx still had two places where it was explicitly converting -ENOSPC to 0 causing regressions. This fixes those spots by allowing -ENOSPC to be returned. That seems to fix recent regressions with vmwgfx. Signed-off-by: Zack Rusin <zackr@vmware.com> Reviewed-by: Roland Scheidegger <sroland@vmware.com> Reviewed-by: Martin Krastev <krastevm@vmware.com> Sigend-off-by: Roland Scheidegger <sroland@vmware.com>
1 parent a1b8638 commit f54c444

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static int vmw_gmrid_man_get_node(struct ttm_mem_type_manager *man,
5555

5656
id = ida_alloc_max(&gman->gmr_ida, gman->max_gmr_ids - 1, GFP_KERNEL);
5757
if (id < 0)
58-
return (id != -ENOMEM ? 0 : id);
58+
return id;
5959

6060
spin_lock(&gman->lock);
6161

drivers/gpu/drm/vmwgfx/vmwgfx_thp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static int vmw_thp_get_node(struct ttm_mem_type_manager *man,
9595
mem->start = node->start;
9696
}
9797

98-
return 0;
98+
return ret;
9999
}
100100

101101

0 commit comments

Comments
 (0)