Commit f54c4442 authored Sep 25, 2020 by Zack Rusin Committed by Roland Scheidegger Sep 30, 2020

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>

parent a1b8638b

drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ static int vmw_gmrid_man_get_node(struct ttm_mem_type_manager *man,

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

		spin_lock(&gman->lock);

drivers/gpu/drm/vmwgfx/vmwgfx_thp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ found_unlock:
		mem->start = node->start;
		}

		return 0;
		return ret;
		}

Admin message