From: Greg Kroah-Hartman Date: Wed, 14 Oct 2020 06:55:29 +0000 (+0200) Subject: drop queue-5.8/drm-vmwgfx-fix-error-handling-in-get_node.patch X-Git-Tag: v4.4.239~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=739620838f83371c0f6c074e8407f34b24165553;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.8/drm-vmwgfx-fix-error-handling-in-get_node.patch --- diff --git a/queue-5.8/drm-vmwgfx-fix-error-handling-in-get_node.patch b/queue-5.8/drm-vmwgfx-fix-error-handling-in-get_node.patch deleted file mode 100644 index 8fe5232058c..00000000000 --- a/queue-5.8/drm-vmwgfx-fix-error-handling-in-get_node.patch +++ /dev/null @@ -1,55 +0,0 @@ -From c14fc5489a401b111ff29247fccaea0eb333abd6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Sep 2020 11:54:10 -0400 -Subject: drm/vmwgfx: Fix error handling in get_node - -From: Zack Rusin - -[ Upstream commit f54c4442893b8dfbd3aff8e903c54dfff1aef990 ] - -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 -Reviewed-by: Roland Scheidegger -Reviewed-by: Martin Krastev -Sigend-off-by: Roland Scheidegger -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 2 +- - drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c -index 7da752ca1c34b..b93c558dd86e0 100644 ---- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c -+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c -@@ -57,7 +57,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); - -diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c -index b7c816ba71663..c8b9335bccd8d 100644 ---- a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c -+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c -@@ -95,7 +95,7 @@ found_unlock: - mem->start = node->start; - } - -- return 0; -+ return ret; - } - - --- -2.25.1 - diff --git a/queue-5.8/series b/queue-5.8/series index 51affccc8bd..177322cc030 100644 --- a/queue-5.8/series +++ b/queue-5.8/series @@ -47,7 +47,6 @@ btrfs-move-btrfs_scratch_superblocks-into-btrfs_dev_.patch io_uring-fix-potential-abba-deadlock-in-show_fdinfo.patch drm-amd-pm-removed-fixed-clock-in-auto-mode-dpm.patch drm-amd-display-fix-return-value-check-for-hdcp_work.patch -drm-vmwgfx-fix-error-handling-in-get_node.patch btrfs-move-btrfs_rm_dev_replace_free_srcdev-outside-.patch iommu-vt-d-fix-lockdep-splat-in-iommu_flush_dev_iotl.patch xfrm-clone-xfrma_set_mark-in-xfrm_do_migrate.patch