* [PATCH v3] drm/amdgpu: Fix a deadlock if previous GEM object allocation fails
@ 2021-08-31 7:08 Pan, Xinhui
2021-08-31 7:11 ` Christian König
0 siblings, 1 reply; 2+ messages in thread
From: Pan, Xinhui @ 2021-08-31 7:08 UTC (permalink / raw)
To: amd-gfx; +Cc: Koenig, Christian, Deucher, Alexander, Grodzovsky, Andrey
Fall through to handle the error instead of return.
Fixes: f8aab60422c37 ("drm/amdgpu: Initialise drm_gem_object_funcs for
imported BOs")
Cc: stable@vger.kernel.org
Signed-off-by: xinhui pan <xinhui.pan@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 85b292ed5c43..9e2525b96d04 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -341,21 +341,18 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,
r = amdgpu_gem_object_create(adev, size, args->in.alignment,
initial_domain,
flags, ttm_bo_type_device, resv, &gobj);
- if (r) {
- if (r != -ERESTARTSYS) {
- if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {
- flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
- goto retry;
- }
+ if (r && r != -ERESTARTSYS) {
+ if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {
+ flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
+ goto retry;
+ }
- if (initial_domain == AMDGPU_GEM_DOMAIN_VRAM) {
- initial_domain |= AMDGPU_GEM_DOMAIN_GTT;
- goto retry;
- }
- DRM_DEBUG("Failed to allocate GEM object (%llu, %d, %llu, %d)\n",
- size, initial_domain, args->in.alignment, r);
+ if (initial_domain == AMDGPU_GEM_DOMAIN_VRAM) {
+ initial_domain |= AMDGPU_GEM_DOMAIN_GTT;
+ goto retry;
}
- return r;
+ DRM_DEBUG("Failed to allocate GEM object (%llu, %d, %llu, %d)\n",
+ size, initial_domain, args->in.alignment, r);
}
if (flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID) {
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] drm/amdgpu: Fix a deadlock if previous GEM object allocation fails
2021-08-31 7:08 [PATCH v3] drm/amdgpu: Fix a deadlock if previous GEM object allocation fails Pan, Xinhui
@ 2021-08-31 7:11 ` Christian König
0 siblings, 0 replies; 2+ messages in thread
From: Christian König @ 2021-08-31 7:11 UTC (permalink / raw)
To: Pan, Xinhui, amd-gfx; +Cc: Deucher, Alexander, Grodzovsky, Andrey
Am 31.08.21 um 09:08 schrieb Pan, Xinhui:
> Fall through to handle the error instead of return.
>
> Fixes: f8aab60422c37 ("drm/amdgpu: Initialise drm_gem_object_funcs for
> imported BOs")
> Cc: stable@vger.kernel.org
> Signed-off-by: xinhui pan <xinhui.pan@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 ++++++++++-------------
> 1 file changed, 10 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> index 85b292ed5c43..9e2525b96d04 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> @@ -341,21 +341,18 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,
> r = amdgpu_gem_object_create(adev, size, args->in.alignment,
> initial_domain,
> flags, ttm_bo_type_device, resv, &gobj);
> - if (r) {
> - if (r != -ERESTARTSYS) {
> - if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {
> - flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
> - goto retry;
> - }
> + if (r && r != -ERESTARTSYS) {
> + if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {
> + flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
> + goto retry;
> + }
>
> - if (initial_domain == AMDGPU_GEM_DOMAIN_VRAM) {
> - initial_domain |= AMDGPU_GEM_DOMAIN_GTT;
> - goto retry;
> - }
> - DRM_DEBUG("Failed to allocate GEM object (%llu, %d, %llu, %d)\n",
> - size, initial_domain, args->in.alignment, r);
> + if (initial_domain == AMDGPU_GEM_DOMAIN_VRAM) {
> + initial_domain |= AMDGPU_GEM_DOMAIN_GTT;
> + goto retry;
> }
> - return r;
> + DRM_DEBUG("Failed to allocate GEM object (%llu, %d, %llu, %d)\n",
> + size, initial_domain, args->in.alignment, r);
> }
>
> if (flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID) {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-31 7:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-31 7:08 [PATCH v3] drm/amdgpu: Fix a deadlock if previous GEM object allocation fails Pan, Xinhui
2021-08-31 7:11 ` Christian König
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.