Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/amdgpu: fix the issue that retry constantly once the" failed to apply to 5.10-stable tree

PATCH [email protected] 1 participant 1 message Feb 8, 2021

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 89fa15ecdca7eb46a711476b961f70a74765bbe4 Mon Sep 17 00:00:00 2001
From: Huang Rui <[email protected]>
Date: Sat, 30 Jan 2021 17:14:30 +0800
Subject: [PATCH] drm/amdgpu: fix the issue that retry constantly once the
buffer is oversize
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We cannot modify initial_domain every time while the retry starts. That will cause the busy waiting that unable to switch to GTT while the vram is not enough.

Fixes f8aab60422c3 ("drm/amdgpu: Initialise drm_gem_object_funcs for imported BOs")
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +1 -1
index d0a1fee1f5f6..174a73eb23f0 100644
@@ -269,8 +269,8 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,
 		resv = vm->root.base.bo->tbo.base.resv;
 	}
 
-retry:
 	initial_domain = (u32)(0xffffffff & args->in.domains);
+retry:
 	r = amdgpu_gem_object_create(adev, size, args->in.alignment,
 				     initial_domain,
 				     flags, ttm_bo_type_device, resv, &gobj);